shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[MIRROR] Adds the Ancient Cloning Lab ruin (#5814)

Browse Source 
* Adds the Ancient Cloning Lab ruin

* fixes conflicts
This commit is contained in:
CitadelStationBot
2018-03-05 15:20:49 -06:00
committed by Poojawa
parent 032511a03e
commit 766b85908e
24 changed files with 1221 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/circuitboards/computer_circuitboards.dm
+4
View File
@@ -111,6 +111,10 @@
name = "Cloning (Computer Board)"
build_path = /obj/machinery/computer/cloning
/obj/item/circuitboard/computer/prototype_cloning
name = "Prototype Cloning (Computer Board)"
build_path = /obj/machinery/computer/prototype_cloning
/obj/item/circuitboard/computer/arcade/battle
name = "Arcade Battle (Computer Board)"
build_path = /obj/machinery/computer/arcade/battle
code/game/objects/items/circuitboards/machine_circuitboards.dm
+4
View File
@@ -31,6 +31,10 @@
/obj/item/stock_parts/manipulator = 2,
/obj/item/stack/sheet/glass = 1)
/obj/item/circuitboard/machine/clonepod/experimental
name = "Experimental Clone Pod (Machine Board)"
build_path = /obj/machinery/clonepod/experimental
/obj/item/circuitboard/machine/abductor
name = "alien board (Report This)"
icon_state = "abductor_mod"
code/game/objects/structures/crates_lockers/closets/fitness.dm
+64 -64
View File
@@ -1,65 +1,65 @@
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
icon_door = "mixed"
/obj/structure/closet/athletic_mixed/PopulateContents()
..()
new /obj/item/clothing/under/shorts/purple(src)
new /obj/item/clothing/under/shorts/grey(src)
new /obj/item/clothing/under/shorts/black(src)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/jabroni(src)
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
/obj/structure/closet/boxinggloves/PopulateContents()
..()
new /obj/item/clothing/gloves/boxing/blue(src)
new /obj/item/clothing/gloves/boxing/green(src)
new /obj/item/clothing/gloves/boxing/yellow(src)
new /obj/item/clothing/gloves/boxing(src)
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
/obj/structure/closet/masks/PopulateContents()
..()
new /obj/item/clothing/mask/luchador(src)
new /obj/item/clothing/mask/luchador/rudos(src)
new /obj/item/clothing/mask/luchador/tecnicos(src)
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "red"
/obj/structure/closet/lasertag/red/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser/redtag(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/head/helmet/redtaghelm(src)
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "blue"
/obj/structure/closet/lasertag/blue/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser/bluetag(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/bluetag(src)
/obj/structure/closet/athletic_mixed
name = "athletic wardrobe"
desc = "It's a storage unit for athletic wear."
icon_door = "mixed"
/obj/structure/closet/athletic_mixed/PopulateContents()
..()
new /obj/item/clothing/under/shorts/purple(src)
new /obj/item/clothing/under/shorts/grey(src)
new /obj/item/clothing/under/shorts/black(src)
new /obj/item/clothing/under/shorts/red(src)
new /obj/item/clothing/under/shorts/blue(src)
new /obj/item/clothing/under/shorts/green(src)
new /obj/item/clothing/under/jabroni(src)
/obj/structure/closet/boxinggloves
name = "boxing gloves"
desc = "It's a storage unit for gloves for use in the boxing ring."
/obj/structure/closet/boxinggloves/PopulateContents()
..()
new /obj/item/clothing/gloves/boxing/blue(src)
new /obj/item/clothing/gloves/boxing/green(src)
new /obj/item/clothing/gloves/boxing/yellow(src)
new /obj/item/clothing/gloves/boxing(src)
/obj/structure/closet/masks
name = "mask closet"
desc = "IT'S A STORAGE UNIT FOR FIGHTER MASKS OLE!"
/obj/structure/closet/masks/PopulateContents()
..()
new /obj/item/clothing/mask/luchador(src)
new /obj/item/clothing/mask/luchador/rudos(src)
new /obj/item/clothing/mask/luchador/tecnicos(src)
/obj/structure/closet/lasertag/red
name = "red laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "red"
/obj/structure/closet/lasertag/red/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser/redtag(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/redtag(src)
new /obj/item/clothing/head/helmet/redtaghelm(src)
/obj/structure/closet/lasertag/blue
name = "blue laser tag equipment"
desc = "It's a storage unit for laser tag equipment."
icon_door = "blue"
/obj/structure/closet/lasertag/blue/PopulateContents()
..()
for(var/i in 1 to 3)
new /obj/item/gun/energy/laser/bluetag(src)
for(var/i in 1 to 3)
new /obj/item/clothing/suit/bluetag(src)
new /obj/item/clothing/head/helmet/bluetaghelm(src)