cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-07-19 12:13:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactors code to work with BYOND 500.

Browse Source 
500 adds a "color" var to /atom, which conflicts with /obj/item/color, /obj/atmospherics/color and various simple_animals.
  /obj/item/color is now item_color
  /obj/atmospherics/color is now pipe_color
  simple_animals color is now body_color
Removes transformer.dm since it conflicted with transform() and was never used.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
This commit is contained in:
Mloc-Argent
2013-09-22 12:39:48 +01:00
parent 2493a0a671
commit e9bf414820
51 changed files with 1372 additions and 1373 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/SkyMarshal/officer_stuff.dm
+3 -3
View File
@@ -23,7 +23,7 @@
name = "\improper NanoTrasen Navy Uniform"
icon_state = "officer"
item_state = "g_suit"
color = "officer"
item_color = "officer"
displays_id = 0
/obj/item/clothing/under/rank/centcom/officer
@@ -31,7 +31,7 @@
name = "\improper NanoTrasen Officers Uniform"
icon_state = "officer"
item_state = "g_suit"
color = "officer"
item_color = "officer"
displays_id = 0
/obj/item/clothing/under/rank/centcom/captain
@@ -39,5 +39,5 @@
name = "\improper NanoTrasen Captains Uniform"
icon_state = "centcom"
item_state = "dg_suit"
color = "centcom"
item_color = "centcom"
displays_id = 0
code/WorkInProgress/Susan/susan_desert_turfs.dm
+3 -3
View File
@@ -250,7 +250,7 @@ Alien plants should do something if theres a lot of poison
name = "warden's jumpsuit"
icon_state = "wardendnavyclothes"
item_state = "wardendnavyclothes"
color = "wardendnavyclothes"
item_color = "wardendnavyclothes"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS
@@ -259,7 +259,7 @@ Alien plants should do something if theres a lot of poison
desc = "It's made of a slightly sturdier material than standard jumpsuits, to allow for robust protection."
icon_state = "officerdnavyclothes"
item_state = "officerdnavyclothes"
color = "officerdnavyclothes"
item_color = "officerdnavyclothes"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS
@@ -268,7 +268,7 @@ Alien plants should do something if theres a lot of poison
name = "head of security's jumpsuit"
icon_state = "hosdnavyclothes"
item_state = "hosdnavyclothes"
color = "hosdnavyclothes"
item_color = "hosdnavyclothes"
armor = list(melee = 10, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0)
flags = FPRINT | TABLEPASS