cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-29 06:57:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #11288 from Fox-McCloud/toxins-remap

Browse Source 
Remaps Toxins
This commit is contained in:
variableundefined
2019-04-16 19:47:14 +08:00
committed by GitHub
parent e7f97f185a edbb691688
commit 546bd0edf5
6 changed files with 272 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/ATMOSPHERICS/components/binary_devices/pump.dm
-6
View File
@@ -34,12 +34,6 @@ Thus, the two variables affect pump operation are set in New():
radio_connection = null
return ..()
/obj/machinery/atmospherics/binary/pump/highcap
name = "High capacity gas pump"
desc = "A high capacity pump"
target_pressure = 15000000
/obj/machinery/atmospherics/binary/pump/on
icon_state = "map_on"
on = 1
code/game/machinery/vending.dm
+3 -4
View File
@@ -1055,10 +1055,9 @@
/obj/machinery/vending/plasmaresearch
name = "\improper Toximate 3000"
desc = "All the fine parts you need in one vending machine!"
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/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)
products = list(/obj/item/assembly/prox_sensor = 8, /obj/item/assembly/igniter = 8, /obj/item/assembly/signaler = 8,
/obj/item/wirecutters = 1, /obj/item/assembly/timer = 8)
contraband = list(/obj/item/flashlight = 5, /obj/item/assembly/voice = 3, /obj/item/assembly/health = 3, /obj/item/assembly/infra = 3)
/obj/machinery/vending/wallmed1
name = "\improper NanoMed"
code/game/objects/items/weapons/grenades/chem_grenade.dm
+17
View File
@@ -446,6 +446,23 @@
update_icon()
/obj/item/grenade/chem_grenade/firefighting
payload_name = "fire fighting grenade"
desc = "Can help to put out dangerous fires from a distance."
stage = READY
/obj/item/grenade/chem_grenade/firefighting/New()
..()
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
B1.reagents.add_reagent("firefighting_foam", 30)
B2.reagents.add_reagent("firefighting_foam", 30)
beakers += B1
beakers += B2
update_icon()
/obj/item/grenade/chem_grenade/incendiary
payload_name = "incendiary"
desc = "Used for clearing rooms of living things."
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+1
View File
@@ -13,6 +13,7 @@
new /obj/item/storage/backpack/science(src)
new /obj/item/storage/backpack/satchel_tox(src)
new /obj/item/clothing/under/rank/scientist(src)
new /obj/item/clothing/under/rank/scientist/skirt(src)
//new /obj/item/clothing/suit/labcoat/science(src)
new /obj/item/clothing/suit/storage/labcoat/science(src)
new /obj/item/clothing/shoes/white(src)