Skip to content

Commit

Permalink
yea
Browse files Browse the repository at this point in the history
  • Loading branch information
FalloutFalcon committed Jan 26, 2024
1 parent ad28497 commit 8a870e0
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
8 changes: 2 additions & 6 deletions code/modules/guncrafting/frame.dm
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
name = "gun frame"
desc = "a generic gun frame."
icon_state = "frame_olivaw"
generic = FALSE
var/obj/item/gun/result = /obj/item/gun

// Currently installed grip
Expand All @@ -20,14 +19,11 @@
// Which barrels does the frame accept?
var/list/validBarrels = list(/obj/item/part/gun/modular/barrel)

gun_part_type = FRAME

/obj/item/part/gun/frame/Initialize(mapload)
..()
var/spawn_with_preinstalled_parts = TRUE
gun_part_type = GUN_PART_FRAME

/obj/item/part/gun/frame/Initialize(mapload, dont_spawn_with_parts)
..()
var/spawn_with_preinstalled_parts = TRUE
if(dont_spawn_with_parts)
spawn_with_preinstalled_parts = FALSE

Expand Down
11 changes: 3 additions & 8 deletions code/modules/guncrafting/part.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
icon_state = "gun_part_1"
var/gun_part_type = NONE

/obj/item/part/gun/Initialize()
. = ..()
if(generic)
icon_state = "gun_part_[rand(1,6)]"

/obj/item/part/gun/modular
name = "modular gun part"
desc = "You dont think this should exist."
Expand All @@ -20,7 +15,7 @@
name = "generic grip"
desc = "A firearm grip, unattached from a firearm."
icon_state = "grip_wood"
gun_part_type = GRIP
gun_part_type = GUN_PART_GRIP

/obj/item/part/gun/modular/grip/wood
name = "wood grip"
Expand All @@ -36,7 +31,7 @@
name = "generic mechanism"
desc = "All the bits that makes the bullet go bang."
icon_state = "mechanism_pistol"
gun_part_type = MECHANISM
gun_part_type = GUN_PART_MECHANISM

/obj/item/part/gun/modular/mechanism/shotgun
name = "generic shotgun mechanism"
Expand All @@ -47,7 +42,7 @@
name = "generic barrel"
desc = "A gun barrel, which keeps the bullet going in the right direction."
icon_state = "barrel_35"
gun_part_type = BARREL
gun_part_type = GUN_PART_BARREL

/obj/item/part/gun/modular/barrel/shotgun
name = "generic shotgun barrel"
Expand Down
11 changes: 10 additions & 1 deletion code/modules/guncrafting/recipe.dm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,16 @@

/datum/lathe_recipe/gun/winchester
result = /obj/item/gun/ballistic/shotgun/winchester
var/list/validParts = list(
validParts = list(
/obj/item/part/gun/frame/mk1,
/obj/item/part/gun/modular/grip/wood,
/obj/item/part/gun/modular/mechanism/shotgun,
/obj/item/part/gun/modular/barrel/shotgun
)

/datum/lathe_recipe/gun/winchester
result = /obj/item/gun/ballistic/shotgun/winchester
validParts = list(
/obj/item/part/gun/frame/mk1,
/obj/item/part/gun/modular/grip/wood,
/obj/item/part/gun/modular/mechanism/shotgun,
Expand Down
2 changes: 1 addition & 1 deletion shiptest.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2165,7 +2165,7 @@
#include "code\modules\guncrafting\frame.dm"
#include "code\modules\guncrafting\lathe.dm"
#include "code\modules\guncrafting\part.dm"
#include code\modules\guncrafting\recipe.dm
#include "code\modules\guncrafting\recipe.dm"
#include "code\modules\holiday\easter.dm"
#include "code\modules\holiday\foreign_calendar.dm"
#include "code\modules\holiday\holidays.dm"
Expand Down

0 comments on commit 8a870e0

Please sign in to comment.