cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-14 12:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes outdoor platings

Browse Source 
Phororeagent fixes
This commit is contained in:
Repede
2019-12-09 12:04:41 -05:00
parent 78d8e0ae65
commit 0159234240
4 changed files with 337 additions and 332 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/turfs/flooring/flooring_premade.dm
View File

@@ -407,7 +407,7 @@
movement_cost = 0 movement_cost = 0
/turf/simulated/floor/outdoors/snow/plating /turf/simulated/floor/outdoors/snow/plating
name = "snowy playing" name = "snowy plating"
icon_state = "snowyplating" icon_state = "snowyplating"
initial_flooring = /decl/flooring/snow/plating initial_flooring = /decl/flooring/snow/plating
movement_cost = 0 movement_cost = 0

4
code/modules/Phorochemistry/phororeagent.dm
View File

@@ -213,6 +213,10 @@ var/induromol_code = rand(1, 50)
M << "<BR>" M << "<BR>"
break break
/obj/item/weapon/reagent_containers/glass/beaker/lovepotion
name = "beaker (amorapotio)"
prefill = list("amorapotio" = 60)
/datum/reagent/phororeagent/nasty /datum/reagent/phororeagent/nasty
id = "nasty" id = "nasty"
name = "Nasty" name = "Nasty"

1
code/modules/reagents/Chemistry-Holder.dm
View File

@@ -157,6 +157,7 @@
/datum/reagents/proc/del_reagent(var/id) /datum/reagents/proc/del_reagent(var/id)
for(var/datum/reagent/current in reagent_list) for(var/datum/reagent/current in reagent_list)
if (current.id == id) if (current.id == id)
current.on_remove(my_atom) //YW Edit: Calls on_remove before the last of the thing is done, used in phorochemistry
reagent_list -= current reagent_list -= current
qdel(current) qdel(current)
update_total() update_total()

662
maps/yw/cryogaia-05-main.dmm
View File

File diff suppressed because it is too large Load Diff