cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-30 23:48:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge Conflict Resolved

Browse Source
This commit is contained in:
MINIMAN10000
2018-04-17 11:24:50 -07:00
parent f023edefa7 e2437c148f
commit ad53317db1
48 changed files with 648 additions and 364 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/boxes.dm
+20
View File
@@ -829,6 +829,26 @@
return
return ..()
/obj/item/weapon/storage/box/centcomofficer
name = "officer kit"
/obj/item/weapon/storage/box/centcomofficer/New()
..()
contents = list()
new /obj/item/clothing/mask/breath(src)
new /obj/item/weapon/tank/emergency_oxygen/double/full(src)
new /obj/item/device/flashlight/seclite(src)
new /obj/item/weapon/kitchen/knife/combat(src)
new /obj/item/device/radio/centcom(src)
new /obj/item/weapon/door_remote/omni(src)
new /obj/item/weapon/implanter/death_alarm(src)
new /obj/item/weapon/reagent_containers/hypospray/combat/nanites(src)
new /obj/item/weapon/pinpointer/advpinpointer(src)
#undef NODESIGN
#undef NANOTRASEN
#undef SYNDI
code/game/objects/items/weapons/tanks/jetpack.dm
+8
View File
@@ -96,6 +96,14 @@
..()
air_contents.oxygen = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
/obj/item/weapon/tank/jetpack/void/grey
name = "Void Jetpack (Oxygen)"
icon_state = "jetpack-void-grey"
/obj/item/weapon/tank/jetpack/void/gold
name = "Retro Jetpack (Oxygen)"
icon_state = "jetpack-void-gold"
/obj/item/weapon/tank/jetpack/oxygen
name = "Jetpack (Oxygen)"