Merge pull request #13822 from AffectedArc07/removes-red-cross

Removes the last of the red cross
This commit is contained in:
Fox McCloud
2021-01-28 16:41:38 -05:00
committed by GitHub
17 changed files with 492 additions and 549 deletions
File diff suppressed because it is too large Load Diff
@@ -5169,7 +5169,7 @@
/turf/simulated/floor/plasteel/white,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"kT" = (
/obj/structure/sign/redcross,
/obj/structure/sign/lifestar,
/turf/simulated/wall/mineral/plastitanium/nodiagonal,
/area/ruin/unpowered/syndicate_lava_base/medbay)
"kV" = (
@@ -549,9 +549,7 @@
/turf/simulated/floor/plasteel,
/area/ruin/space/ancientstation)
"bD" = (
/obj/structure/sign/redcross{
icon_state = "greencross"
},
/obj/structure/sign/greencross,
/turf/simulated/wall/rust,
/area/ruin/space/ancientstation)
"bE" = (
@@ -3616,9 +3616,7 @@
},
/area/awaymission/centcomAway/general)
"jd" = (
/obj/structure/sign/redcross{
icon_state = "lifestar"
},
/obj/structure/sign/lifestar,
/turf/simulated/wall/r_wall,
/area/awaymission/centcomAway/general)
"je" = (
+5 -25
View File
@@ -40118,11 +40118,7 @@
},
/area/medical/morgue)
"bEy" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
name = "Medbay"
},
/obj/structure/sign/lifestar,
/turf/simulated/wall,
/area/medical/reception)
"bEz" = (
@@ -44657,11 +44653,7 @@
},
/area/medical/morgue)
"bNe" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
name = "Medbay"
},
/obj/structure/sign/lifestar,
/turf/simulated/wall/r_wall,
/area/medical/chemistry)
"bNf" = (
@@ -47798,11 +47790,7 @@
/area/medical/medbay2)
"bSu" = (
/obj/effect/spawner/window/reinforced,
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
name = "Medbay"
},
/obj/structure/sign/lifestar,
/obj/machinery/door/poddoor{
density = 0;
icon_state = "open";
@@ -53971,11 +53959,7 @@
},
/area/medical/medbay2)
"ccD" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
name = "Medbay"
},
/obj/structure/sign/lifestar,
/turf/simulated/wall,
/area/medical/cryo)
"ccE" = (
@@ -60893,11 +60877,7 @@
},
/area/hallway/primary/aft)
"cpj" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
name = "Medbay"
},
/obj/structure/sign/lifestar,
/turf/simulated/wall,
/area/maintenance/genetics)
"cpk" = (
+2 -6
View File
@@ -75,9 +75,7 @@
},
/area/shuttle/administration)
"ah" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
/obj/structure/sign/lifestar{
name = "NHV Asclepius"
},
/turf/simulated/shuttle/wall{
@@ -125,9 +123,7 @@
},
/area/shuttle/administration)
"ak" = (
/obj/structure/sign/redcross{
desc = "The Star of Life, a symbol of Medical Aid.";
icon_state = "lifestar";
/obj/structure/sign/lifestar{
name = "NHV Asclepius"
},
/turf/simulated/shuttle/wall{
+2 -2
View File
@@ -568,7 +568,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"bm" = (
/obj/structure/sign/redcross,
/obj/structure/sign/lifestar,
/turf/simulated/shuttle/wall{
dir = 1;
icon_state = "swallc2"
@@ -920,7 +920,7 @@
/turf/simulated/shuttle/floor,
/area/shuttle/escape)
"bY" = (
/obj/structure/sign/redcross,
/obj/structure/sign/lifestar,
/turf/simulated/shuttle/wall{
dir = 8;
icon_state = "swall2";
+3 -3
View File
@@ -153,10 +153,10 @@
icon = 'icons/obj/mining.dmi'
icon_state = "xeno_warning"
/obj/structure/sign/redcross
/obj/structure/sign/lifestar
name = "medbay"
desc = "The Intergalactic symbol of Medical institutions. You'll probably get help here.'"
icon_state = "redcross"
desc = "The Star of Life, a symbol of Medical Aid."
icon_state = "lifestar"
/obj/structure/sign/greencross
name = "medbay"
@@ -28,7 +28,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
/datum/trade_destination/anansi
name = "NSS Anansi"
description = "Medical station ran by Second Red Cross (but owned by NT) for handling emergency cases from nearby colonies."
description = "Medical station ran by Second Green Cross (but owned by NT) for handling emergency cases from nearby colonies."
distance = 1.7
willing_to_buy = list()
willing_to_sell = list()
@@ -37,7 +37,7 @@ GLOBAL_LIST_EMPTY(weighted_mundaneevent_locations)
/datum/trade_destination/anansi/get_custom_eventstring(var/event_type)
if(event_type == RESEARCH_BREAKTHROUGH)
return "Thanks to research conducted on the NSS Anansi, Second Red Cross Society wishes to announce a major breakthough in the field of \
return "Thanks to research conducted on the NSS Anansi, Second Green Cross Society wishes to announce a major breakthough in the field of \
[pick("mind-machine interfacing","neuroscience","nano-augmentation","genetics")]. Nanotrasen is expected to announce a co-exploitation deal within the fortnight."
return null
+1 -1
View File
@@ -63,7 +63,7 @@
/obj/item/key/ambulance
name = "ambulance key"
desc = "A keyring with a small steel key, and tag with a red cross on it."
desc = "A keyring with a small steel key, and tag with a green cross on it."
icon_state = "keydoc"
+1 -1
View File
@@ -13,5 +13,5 @@
/obj/item/key/snowmobile
name = "snowmobile key"
desc = "A keyring with a small steel key, and tag with a red cross on it; clearly it's not implying you're going to the hospital for this..."
desc = "A keyring with a small steel key, and tag with a green cross on it; Clearly it's not implying you're going to the hospital for this..."
icon_state = "keydoc" //get a better icon, sometime.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 39 KiB

After

Width:  |  Height:  |  Size: 39 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 109 KiB

After

Width:  |  Height:  |  Size: 110 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 113 KiB

After

Width:  |  Height:  |  Size: 114 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 50 KiB