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-29 22:06:58 -07: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
code/modules/vending/assist.dm
+6 -6
View File
@@ -1,12 +1,12 @@
/obj/machinery/vending/assist
products = list(/obj/item/device/assembly/prox_sensor = 5,
/obj/item/device/assembly/igniter = 3,
/obj/item/device/assembly/signaler = 4,
products = list(/obj/item/assembly/prox_sensor = 5,
/obj/item/assembly/igniter = 3,
/obj/item/assembly/signaler = 4,
/obj/item/wirecutters = 1,
/obj/item/cartridge/signal = 4)
contraband = list(/obj/item/device/assembly/timer = 2,
/obj/item/device/assembly/voice = 2,
/obj/item/device/assembly/health = 2)
contraband = list(/obj/item/assembly/timer = 2,
/obj/item/assembly/voice = 2,
/obj/item/assembly/health = 2)
product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!"
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF
code/modules/vending/cartridge.dm
+1 -1
View File
@@ -10,7 +10,7 @@
/obj/item/cartridge/security = 10,
/obj/item/cartridge/janitor = 10,
/obj/item/cartridge/signal/toxins = 10,
/obj/item/device/pda/heads = 10,
/obj/item/pda/heads = 10,
/obj/item/cartridge/captain = 3,
/obj/item/cartridge/quartermaster = 10)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
code/modules/vending/engineering.dm
+2 -2
View File
@@ -15,9 +15,9 @@
/obj/item/screwdriver = 12,
/obj/item/crowbar = 12,
/obj/item/wirecutters = 12,
/obj/item/device/multitool = 12,
/obj/item/multitool = 12,
/obj/item/wrench = 12,
/obj/item/device/t_scanner = 12,
/obj/item/t_scanner = 12,
/obj/item/stock_parts/cell = 8,
/obj/item/weldingtool = 8,
/obj/item/clothing/head/welding = 8,
code/modules/vending/engivend.dm
+2 -2
View File
@@ -6,10 +6,10 @@
req_access_txt = "11" //Engineering Equipment access
products = list(/obj/item/clothing/glasses/meson/engine = 2,
/obj/item/clothing/glasses/welding = 3,
/obj/item/device/multitool = 4,
/obj/item/multitool = 4,
/obj/item/construction/rcd/loaded = 3,
/obj/item/grenade/chem_grenade/smart_metal_foam = 10,
/obj/item/device/geiger_counter = 5,
/obj/item/geiger_counter = 5,
/obj/item/stock_parts/cell/high = 10,
/obj/item/electronics/airlock = 10,
/obj/item/electronics/apc = 10,
code/modules/vending/medical.dm
+2 -2
View File
@@ -7,8 +7,8 @@
req_access_txt = "5"
products = list(/obj/item/reagent_containers/syringe = 12,
/obj/item/reagent_containers/dropper = 3,
/obj/item/device/healthanalyzer = 4,
/obj/item/device/sensor_device = 2,
/obj/item/healthanalyzer = 4,
/obj/item/sensor_device = 2,
/obj/item/pinpointer/crew = 2,
/obj/item/reagent_containers/medspray/sterilizine = 1,
/obj/item/stack/medical/gauze = 8,
code/modules/vending/nutrimax.dm
+1 -1
View File
@@ -13,7 +13,7 @@
/obj/item/storage/bag/plants = 5,
/obj/item/cultivator = 3,
/obj/item/shovel/spade = 3,
/obj/item/device/plant_analyzer = 4)
/obj/item/plant_analyzer = 4)
contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10,
/obj/item/reagent_containers/glass/bottle/diethylamine = 5)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
code/modules/vending/plasmaresearch.dm
+6 -6
View File
@@ -5,9 +5,9 @@
products = list(/obj/item/clothing/under/rank/scientist = 6,
/obj/item/clothing/suit/bio_suit = 6,
/obj/item/clothing/head/bio_hood = 6,
/obj/item/device/transfer_valve = 6,
/obj/item/device/assembly/timer = 6,
/obj/item/device/assembly/signaler = 6,
/obj/item/device/assembly/prox_sensor = 6,
/obj/item/device/assembly/igniter = 6)
contraband = list(/obj/item/device/assembly/health = 3)
/obj/item/transfer_valve = 6,
/obj/item/assembly/timer = 6,
/obj/item/assembly/signaler = 6,
/obj/item/assembly/prox_sensor = 6,
/obj/item/assembly/igniter = 6)
contraband = list(/obj/item/assembly/health = 3)
code/modules/vending/robotics.dm
+4 -4
View File
@@ -8,11 +8,11 @@
products = list(/obj/item/clothing/suit/toggle/labcoat = 4,
/obj/item/clothing/under/rank/roboticist = 4,
/obj/item/stack/cable_coil = 4,
/obj/item/device/assembly/flash/handheld = 4,
/obj/item/assembly/flash/handheld = 4,
/obj/item/stock_parts/cell/high = 12,
/obj/item/device/assembly/prox_sensor = 3,
/obj/item/device/assembly/signaler = 3,
/obj/item/device/healthanalyzer = 3,
/obj/item/assembly/prox_sensor = 3,
/obj/item/assembly/signaler = 3,
/obj/item/healthanalyzer = 3,
/obj/item/scalpel = 2,
/obj/item/circular_saw = 2,
/obj/item/tank/internals/anesthetic = 2,
code/modules/vending/security.dm
+4 -4
View File
@@ -8,10 +8,10 @@
products = list(/obj/item/restraints/handcuffs = 8,
/obj/item/restraints/handcuffs/cable/zipties = 10,
/obj/item/grenade/flashbang = 4,
/obj/item/device/assembly/flash/handheld = 5,
/obj/item/assembly/flash/handheld = 5,
/obj/item/reagent_containers/food/snacks/donut = 12,
/obj/item/storage/box/evidence = 6,
/obj/item/device/flashlight/seclite = 4,
/obj/item/flashlight/seclite = 4,
/obj/item/restraints/legcuffs/bola/energy = 7)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/fancy/donut_box = 2)
@@ -23,7 +23,7 @@
if(istype(I, /obj/item/grenade))
var/obj/item/grenade/G = I
G.preprime()
else if(istype(I, /obj/item/device/flashlight))
var/obj/item/device/flashlight/F = I
else if(istype(I, /obj/item/flashlight))
var/obj/item/flashlight/F = I
F.on = TRUE
F.update_brightness()
code/modules/vending/youtool.dm
+5 -5
View File
@@ -9,12 +9,12 @@
/obj/item/weldingtool = 3,
/obj/item/wirecutters = 5,
/obj/item/wrench = 5,
/obj/item/device/analyzer = 5,
/obj/item/device/t_scanner = 5,
/obj/item/analyzer = 5,
/obj/item/t_scanner = 5,
/obj/item/screwdriver = 5,
/obj/item/device/flashlight/glowstick = 3,
/obj/item/device/flashlight/glowstick/red = 3,
/obj/item/device/flashlight = 5)
/obj/item/flashlight/glowstick = 3,
/obj/item/flashlight/glowstick/red = 3,
/obj/item/flashlight = 5)
contraband = list(/obj/item/weldingtool/hugetank = 2,
/obj/item/clothing/gloves/color/fyellow = 2)
premium = list(/obj/item/clothing/gloves/color/yellow = 1)