Removes gas mixture graphic overlay code, Moves all of that to turfs.

(also fixes conflicts)

Conflicts:
	code/LINDA/LINDA_turf_tile.dm
This commit is contained in:
MrStonedOne
2015-07-15 00:44:01 -07:00
67 changed files with 942 additions and 693 deletions
-17
View File
@@ -41,8 +41,6 @@ What are the archived variables for?
var/last_share
var/graphic
var/list/datum/gas/trace_gases = list()
@@ -53,7 +51,6 @@ What are the archived variables for?
var/tmp/temperature_archived
var/tmp/graphic_archived
var/tmp/fuel_burnt = 0
//PV=nRT - related procedures
@@ -103,19 +100,7 @@ What are the archived variables for?
//Procedures used for very specific events
/datum/gas_mixture/proc/check_tile_graphic()
//returns 1 if graphic changed
graphic = null
if(toxins > MOLES_PLASMA_VISIBLE)
graphic = "plasma"
else
var/datum/gas/sleeping_agent = locate(/datum/gas/sleeping_agent) in trace_gases
if(sleeping_agent && (sleeping_agent.moles > 1))
graphic = "sleeping_agent"
else
graphic = null
return graphic != graphic_archived
/datum/gas_mixture/proc/react(atom/dump_location)
var/reacting = 0 //set to 1 if a notable reaction occured (used by pipe_network)
@@ -291,8 +276,6 @@ What are the archived variables for?
temperature_archived = temperature
graphic_archived = graphic
return 1
/datum/gas_mixture/check_then_merge(datum/gas_mixture/giver)
+2 -2
View File
@@ -831,7 +831,7 @@
log_admin("[key_name(usr)] has de-gang'ed [current].")
if("equip")
switch(ticker.mode.equip_gang(current))
switch(ticker.mode.equip_gang(current,gang_datum))
if(1)
usr << "<span class='warning'>Unable to equip territory spraycan!</span>"
if(2)
@@ -1392,7 +1392,7 @@
G.add_gang_hud(src)
ticker.mode.forge_gang_objectives(src)
ticker.mode.greet_gang(src)
ticker.mode.equip_gang(current)
ticker.mode.equip_gang(current,G)
/datum/mind/proc/make_Abductor()
var/role = alert("Abductor Role ?","Role","Agent","Scientist")
+2 -2
View File
@@ -382,7 +382,7 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
name = "Standard Justice Enforcer Crate"
contains = list(/obj/item/clothing/head/helmet/justice,
/obj/item/clothing/mask/gas/sechailer)
cost = 30 //justice comes at a price. An expensive, noisy price.
cost = 80 //justice comes at a price. An expensive, noisy price.
containername = "justice enforcer crate"
@@ -1279,4 +1279,4 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine
/obj/item/ammo_box/magazine/toy/pistol)
cost = 40
containername = "foam force pistols crate"
contraband = 1
contraband = 1
+1 -1
View File
@@ -735,7 +735,7 @@ var/list/uplink_items = list()
/datum/uplink_item/badass/bundle
name = "Syndicate Bundle"
desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 10 telecrystals, but you do not know which specialisation you will receive."
desc = "Syndicate Bundles are specialised groups of items that arrive in a plain box. These items are collectively worth more than 20 telecrystals, but you do not know which specialisation you will receive."
item = /obj/item/weapon/storage/box/syndicate
cost = 20
excludefrom = list(/datum/game_mode/nuclear,/datum/game_mode/gang)