cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 20:16:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixes merge conflict

Browse Source
This commit is contained in:
Kyep
2018-06-06 16:32:31 -07:00
parent 7ca6981413 dd6b879546
commit 4d4eb16a3a
671 changed files with 8684 additions and 8646 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spacepods/spacepod.dm
+8 -8
View File
@@ -1,6 +1,6 @@
#define DAMAGE 1
#define FIRE 2
#define LIGHT 1
#define POD_LIGHT 1
#define WINDOW 2
#define RIM 3
#define PAINT 4
@@ -78,7 +78,7 @@
var/part = input(user, "Choose part", null) as null|anything in list("Lights","Rim","Paint","Windows")
switch(part)
if("Lights")
part_type = LIGHT
part_type = POD_LIGHT
if("Rim")
part_type = RIM
if("Paint")
@@ -101,7 +101,7 @@
pod_overlays[FIRE] = image(icon, icon_state="pod_fire")
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -162,7 +162,7 @@
if(!pod_paint_effect)
pod_paint_effect = new/list(4)
pod_paint_effect[LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[POD_LIGHT] = image(icon,icon_state = "LIGHTS")
pod_paint_effect[WINDOW] = image(icon,icon_state = "Windows")
pod_paint_effect[RIM] = image(icon,icon_state = "RIM")
pod_paint_effect[PAINT] = image(icon,icon_state = "PAINT")
@@ -170,9 +170,9 @@
if(has_paint)
var/image/to_add
if(!isnull(pod_paint_effect[LIGHT]))
to_add = pod_paint_effect[LIGHT]
to_add.color = colors[LIGHT]
if(!isnull(pod_paint_effect[POD_LIGHT]))
to_add = pod_paint_effect[POD_LIGHT]
to_add.color = colors[POD_LIGHT]
overlays += to_add
if(!isnull(pod_paint_effect[WINDOW]))
to_add = pod_paint_effect[WINDOW]
@@ -1080,6 +1080,6 @@ obj/spacepod/proc/add_equipment(mob/user, var/obj/item/spacepod_equipment/SPE, v
#undef DAMAGE
#undef FIRE
#undef WINDOW
#undef LIGHT
#undef POD_LIGHT
#undef RIM
#undef PAINT