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

Kills off /obj/item/device (#6561)

Browse Source
This commit is contained in:
kevinz000
2018-04-30 00:06:58 -05:00
committed by Poojawa
parent ab3035a4ea
commit 3369c804b2
538 changed files with 6728 additions and 6707 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modular_citadel/code/modules/clothing/spacesuits/flightsuit.dm
+1 -1
View File
@@ -1,5 +1,5 @@
/obj/item/device/flightpack
/obj/item/flightpack
armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 100, "rad" = 20, "fire" = 20, "acid" = 20)
/obj/item/clothing/suit/space/hardsuit/flightsuit
modular_citadel/code/modules/clothing/under/trek_under.dm
+10 -10
View File
@@ -99,9 +99,9 @@
body_parts_covered = CHEST|GROIN|ARMS
permeability_coefficient = 0.50
allowed = list(
/obj/item/device/flashlight, /obj/item/device/analyzer,
/obj/item/device/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/device/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/flashlight, /obj/item/analyzer,
/obj/item/radio, /obj/item/tank/internals/emergency_oxygen,
/obj/item/reagent_containers/hypospray, /obj/item/healthanalyzer,/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,/obj/item/reagent_containers/glass/beaker,
/obj/item/reagent_containers/pill,/obj/item/storage/pill_bottle, /obj/item/restraints/handcuffs,/obj/item/hypospray
)
@@ -146,20 +146,20 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/device/analyzer,
/obj/item/device/radio,
/obj/item/flashlight,
/obj/item/analyzer,
/obj/item/radio,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/reagent_containers/hypospray,
/obj/item/hypospray,
/obj/item/device/healthanalyzer,
/obj/item/healthanalyzer,
/obj/item/reagent_containers/syringe,
/obj/item/reagent_containers/glass/bottle/vial,
/obj/item/reagent_containers/glass/beaker,
/obj/item/storage/pill_bottle,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 10, "bullet" = 5, "laser" = 5,"energy" = 5, "bomb" = 5, "bio" = 5, "rad" = 10, "fire" = 10, "acid" = 0)
var/unbuttoned = 0
@@ -212,11 +212,11 @@
body_parts_covered = CHEST|GROIN|ARMS
allowed = list(
/obj/item/tank/internals/emergency_oxygen,
/obj/item/device/flashlight,
/obj/item/flashlight,
/obj/item/gun,
/obj/item/melee/baton,
/obj/item/restraints/handcuffs,
/obj/item/device/taperecorder)
/obj/item/taperecorder)
armor = list("melee" = 45, "bullet" = 25, "laser" = 25,"energy" = 25, "bomb" = 25, "bio" = 25, "rad" = 50, "fire" = 50, "acid" = 50)
//Variants