cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-27 18:42:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed the bug with supply not sending supermatter if only one crate (it was deleting it instead of deleting the process...odd)

Browse Source 
Also fixed a bug where if the supermatter is ordered off the supply shuttle it wouldn't produce power (process was deleted while in crate)

supplypacks.dm is just a spelling fix.
This commit is contained in:
Ccomp5950
2013-11-19 00:49:55 -06:00
parent fc4107e6ec
commit 39ed2b7042
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/WorkInProgress/Yinadele/Supermatter.dm
View File

@@ -85,8 +85,11 @@
var/turf/L = loc var/turf/L = loc
if(!istype(L)) //If we are not on a turf, uh oh. if(isnull(L)) // We have a null turf...something is wrong, stop processing this entity.
del src return PROCESS_KILL
if(!istype(L)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
return //Yeah just stop.
//Ok, get the air from the turf //Ok, get the air from the turf
var/datum/gas_mixture/env = L.return_air() var/datum/gas_mixture/env = L.return_air()

4
code/datums/supplypacks.dm
View File

@@ -958,7 +958,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/machinery/power/supermatter) contains = list(/obj/machinery/power/supermatter)
cost = 50 cost = 50
containertype = /obj/structure/closet/crate/secure/plasma containertype = /obj/structure/closet/crate/secure/plasma
containername = "Supermatter crate (CAUTIION)" containername = "Supermatter crate (CAUTION)"
group = "Engineering" group = "Engineering"
access = access_ce access = access_ce
@@ -968,7 +968,7 @@ var/list/all_supply_groups = list("Operations","Security","Hospitality","Enginee
contains = list(/obj/machinery/power/supermatter/shard) contains = list(/obj/machinery/power/supermatter/shard)
cost = 25 cost = 25
containertype = /obj/structure/closet/crate/secure/plasma containertype = /obj/structure/closet/crate/secure/plasma
containername = "Supermatter shard crate (CAUTIION)" containername = "Supermatter shard crate (CAUTION)"
access = access_ce access = access_ce
group = "Engineering" */ group = "Engineering" */