shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #9047 from Poojawa/syntheticbloods

Browse Source 
RGB Blood Reworks + Blood generator
This commit is contained in:
deathride58
2019-10-23 20:54:55 -04:00
committed by GitHub
parent 2a6cbe4df2 d6e28180a1
commit f85f110baa
127 changed files with 2228 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files
_maps/RandomRuins/LavaRuins/lavaland_surface_alien_nest.dmm
+4 -4
View File
@@ -167,7 +167,7 @@
/area/ruin/unpowered/xenonest)
"aM" = (
/obj/structure/alien/weeds,
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/ruin/unpowered/xenonest)
"aQ" = (
@@ -260,7 +260,7 @@
/obj/structure/stone_tile/cracked{
dir = 1
},
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/xenonest)
"be" = (
@@ -381,7 +381,7 @@
/obj/structure/stone_tile{
dir = 1
},
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/xenonest)
"bs" = (
@@ -439,7 +439,7 @@
/obj/structure/stone_tile{
dir = 8
},
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/indestructible/boss/air,
/area/ruin/unpowered/xenonest)
"by" = (
_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm
+1
View File
@@ -279,6 +279,7 @@
},
/turf/open/floor/plasteel/freezer,
/area/ruin/powered/seedvault)
(1,1,1) = {"
a
a
_maps/RandomRuins/SpaceRuins/bigderelict1.dmm
+2 -2
View File
@@ -1288,7 +1288,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cV" = (
/obj/effect/decal/cleanable/xenoblood/xsplatter,
/obj/effect/decal/cleanable/blood/splatter/xeno,
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"cW" = (
@@ -1525,7 +1525,7 @@
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/derelictoutpost/cargobay)
"dq" = (
/obj/effect/decal/cleanable/xenoblood/xsplatter,
/obj/effect/decal/cleanable/blood/splatter/xeno,
/obj/structure/alien/weeds{
color = "#4BAE56";
desc = "A thick gelatinous surface covers the floor. Someone get the golashes.";
_maps/RandomZLevels/Academy.dmm
+1 -1
View File
@@ -3830,7 +3830,7 @@
/turf/open/floor/engine/cult,
/area/awaymission/academy/academycellar)
"kY" = (
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/engine/cult,
/area/awaymission/academy/academycellar)
"kZ" = (
_maps/RandomZLevels/caves.dmm
+3 -3
View File
@@ -873,7 +873,7 @@
/obj/structure/window/reinforced{
dir = 4
},
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14"
},
@@ -945,7 +945,7 @@
/area/awaymission/caves/research)
"cN" = (
/obj/machinery/door/window/eastleft,
/obj/effect/decal/cleanable/xenoblood/xgibs,
/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14"
},
@@ -1015,7 +1015,7 @@
},
/area/awaymission/caves/BMP_asteroid/level_two)
"cV" = (
/obj/effect/decal/cleanable/xenoblood/xgibs,
/obj/effect/decal/cleanable/blood/gibs/xeno,
/turf/open/floor/plating{
initial_gas_mix = "n2=23;o2=14"
},
_maps/RandomZLevels/moonoutpost19.dmm
+3 -3
View File
@@ -5597,8 +5597,8 @@
},
/area/awaymission/moonoutpost19/arrivals)
"kK" = (
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/xenoblood/xgibs,
/obj/effect/decal/cleanable/blood/xeno,
/obj/effect/decal/cleanable/blood/gibs/xeno,
/obj/effect/turf_decal/tile/bar,
/obj/effect/turf_decal/tile/bar{
dir = 1
@@ -5608,7 +5608,7 @@
},
/area/awaymission/moonoutpost19/arrivals)
"kL" = (
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/obj/effect/decal/remains/xeno{
desc = "They look like the remains of something... alien. The front of skull appears to have been completely obliterated."
},
_maps/map_files/BoxStation/BoxStation.dmm
+6 -6
View File
@@ -34753,12 +34753,7 @@
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCO" = (
/obj/structure/table,
/obj/item/storage/box/bodybags{
pixel_x = 3;
pixel_y = 3
},
/obj/item/storage/box/rxglasses,
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bCP" = (
@@ -36538,6 +36533,11 @@
"bGR" = (
/obj/structure/table,
/obj/item/hand_labeler,
/obj/item/storage/box/rxglasses,
/obj/item/storage/box/bodybags{
pixel_x = 3;
pixel_y = 3
},
/obj/item/gun/syringe,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
_maps/map_files/Deltastation/DeltaStation2.dmm
+2 -2
View File
@@ -89232,7 +89232,7 @@
/area/maintenance/port)
"cTz" = (
/obj/effect/decal/remains/xeno,
/obj/effect/decal/cleanable/xenoblood,
/obj/effect/decal/cleanable/blood/xeno,
/turf/open/floor/circuit/green,
/area/science/xenobiology)
"cTA" = (
@@ -93013,10 +93013,10 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cZK" = (
/obj/item/twohanded/required/kirbyplants/random,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/medbay/central)
"cZL" = (
_maps/map_files/MetaStation/MetaStation.dmm
+1 -5
View File
@@ -56605,11 +56605,6 @@
/turf/open/floor/plasteel/dark,
/area/medical/sleeper)
"cfK" = (
/obj/structure/table,
/obj/item/paper_bin{
pixel_x = -2;
pixel_y = 4
},
/obj/machinery/light_switch{
pixel_x = 11;
pixel_y = 23
@@ -56624,6 +56619,7 @@
/obj/effect/turf_decal/tile/neutral{
dir = 8
},
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/dark,
/area/medical/sleeper)
"cfL" = (
_maps/map_files/OmegaStation/OmegaStation.dmm
+2 -4
View File
@@ -30073,10 +30073,8 @@
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"bbs" = (
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21"
},
/obj/effect/turf_decal/tile/blue,
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/medbay/zone3)
"bbt" = (
@@ -43077,7 +43075,7 @@
/turf/open/floor/plasteel,
/area/engine/atmos)
"vsf" = (
/obj/effect/decal/cleanable/xenoblood/xgibs,
/obj/effect/decal/cleanable/blood/gibs/xeno,
/obj/effect/turf_decal/tile/neutral{
dir = 1
},
_maps/map_files/PubbyStation/PubbyStation.dmm
+1 -4
View File
@@ -31871,14 +31871,11 @@
/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{
dir = 4
},
/obj/item/twohanded/required/kirbyplants{
icon_state = "plant-21";
pixel_y = 3
},
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/machinery/bloodbankgen,
/turf/open/floor/plasteel/white,
/area/medical/sleeper)
"bwG" = (