Merge pull request #24 from TalkingCactus/master

Fixes Mutant Colors Not Saving
This commit is contained in:
TalkingCactus
2016-08-27 12:01:04 -04:00
committed by GitHub
95 changed files with 7249 additions and 126727 deletions
@@ -1,526 +1,56 @@
//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE
"a" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/lavaland/surface/outdoors)
"b" = (
/turf/closed/mineral/volcanic/lava_land_surface,
/area/ruin/powered)
"c" = (
/turf/closed/wall/mineral/iron{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"d" = (
/obj/item/clothing/head/helmet/space/orange,
/obj/item/clothing/mask/breath,
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"e" = (
/obj/item/clothing/suit/space/orange,
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"f" = (
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"g" = (
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"h" = (
/obj/item/weapon/shovel,
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"i" = (
/obj/item/weapon/reagent_containers/glass/bucket,
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"j" = (
/obj/structure/sink/puddle,
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"k" = (
/obj/effect/glowshroom/single,
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"l" = (
/obj/item/weapon/storage/toolbox/emergency,
/turf/open/floor/plating/asteroid{
baseturf = /turf/open/floor/plating/asteroid/basalt;
name = "dirt"
},
/area/ruin/powered)
"m" = (
/obj/structure/rack,
/obj/item/seeds/reishi,
/obj/item/seeds/plump,
/obj/item/seeds/plump,
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"n" = (
/obj/machinery/hydroponics/soil,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"o" = (
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"p" = (
/obj/structure/rack,
/obj/item/weapon/storage/bag/ore,
/obj/item/weapon/storage/firstaid/regular,
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"q" = (
/obj/effect/glowshroom/single,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"r" = (
/obj/structure/rack,
/obj/item/weapon/pickaxe/emergency,
/obj/item/weapon/tank/internals/oxygen,
/turf/open/floor/plating/asteroid/basalt,
/area/ruin/powered)
"s" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/area/lavaland/surface/outdoors)
"t" = (
/turf/closed/wall/shuttle/survival/pod{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"u" = (
/obj/structure/bed/pod,
/obj/item/weapon/bedsheet/black,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"v" = (
/obj/structure/fans,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"w" = (
/obj/machinery/smartfridge/survival_pod,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"x" = (
/obj/effect/mob_spawn/human/hermit,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"y" = (
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"z" = (
/obj/machinery/light/small{
dir = 4
},
/obj/structure/tubes,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"A" = (
/obj/structure/table,
/obj/item/weapon/kitchen/knife/combat/survival,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface
},
/area/ruin/powered)
"B" = (
/obj/structure/table/survival_pod,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"C" = (
/obj/structure/tubes,
/obj/item/weapon/crowbar,
/obj/effect/decal/cleanable/blood/drip,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"D" = (
/obj/effect/decal/cleanable/blood/footprints{
tag = "icon-blood1 (NORTH)";
icon_state = "blood1";
dir = 1
},
/obj/machinery/door/airlock/survival_pod,
/obj/structure/fans/tiny,
/turf/open/floor/pod/dark{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface
},
/area/ruin/powered)
"E" = (
/obj/structure/shuttle/engine/propulsion/burst{
dir = 4
},
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/powered)
"F" = (
/turf/closed/wall/shuttle{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
dir = 2;
icon_state = "swall12"
},
/area/ruin/powered)
"G" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/closed/wall/shuttle{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
dir = 2;
icon_state = "swall_f10";
layer = 2
},
/area/ruin/powered)
"H" = (
/obj/machinery/door/airlock/shuttle{
name = "Escape Pod Airlock"
},
/turf/open/floor/plasteel/shuttle,
/area/ruin/powered)
"I" = (
/obj/structure/chair{
dir = 4
},
/turf/open/floor/plasteel/shuttle{
baseturf = /turf/open/floor/plating/asteroid/basalt
},
/area/ruin/powered)
"J" = (
/obj/structure/grille,
/obj/structure/window/shuttle,
/turf/open/floor/plating{
baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface;
initial_gas_mix = "o2=14;n2=23;TEMP=300"
},
/area/ruin/powered)
"K" = (
/turf/open/floor/plating/asteroid/basalt/lava_land_surface,
/turf/closed/wall/shuttle{
baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface;
dir = 2;
icon_state = "swall_f9"
},
/area/ruin/powered)
"a" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/lavaland/surface/outdoors)
"b" = (/turf/closed/mineral/volcanic/lava_land_surface,/area/ruin/powered)
"c" = (/turf/closed/wall/mineral/iron{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"d" = (/obj/item/clothing/head/helmet/space/orange,/obj/item/clothing/mask/breath,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"e" = (/obj/item/clothing/suit/space/orange,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"f" = (/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"g" = (/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"h" = (/obj/item/weapon/shovel,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"i" = (/obj/item/weapon/reagent_containers/glass/bucket,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"j" = (/obj/structure/sink/puddle,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"k" = (/obj/effect/glowshroom/single,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"l" = (/obj/item/weapon/storage/toolbox/emergency,/turf/open/floor/plating/asteroid{baseturf = /turf/open/floor/plating/asteroid/basalt; name = "dirt"},/area/ruin/powered)
"m" = (/obj/structure/rack,/obj/item/seeds/reishi,/obj/item/seeds/plump,/obj/item/seeds/plump,/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"n" = (/obj/machinery/hydroponics/soil,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"o" = (/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"p" = (/obj/structure/rack,/obj/item/weapon/storage/bag/ore,/obj/item/weapon/storage/firstaid/regular,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"q" = (/obj/effect/glowshroom/single,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"r" = (/obj/structure/rack,/obj/item/weapon/pickaxe/emergency,/obj/item/weapon/tank/internals/oxygen,/turf/open/floor/plating/asteroid/basalt,/area/ruin/powered)
"s" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/lavaland/surface/outdoors)
"t" = (/turf/closed/wall/shuttle/survival/pod{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"u" = (/obj/structure/bed/pod,/obj/item/weapon/bedsheet/black,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"v" = (/obj/structure/fans,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"w" = (/obj/machinery/smartfridge/survival_pod,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"x" = (/obj/effect/mob_spawn/human/hermit,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"y" = (/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"z" = (/obj/machinery/light/small{dir = 4},/obj/structure/tubes,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"A" = (/obj/structure/table,/obj/item/weapon/kitchen/knife/combat/survival,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface},/area/ruin/powered)
"B" = (/obj/structure/table/survival_pod,/obj/item/weapon/storage/bag/plants/portaseeder,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"C" = (/obj/structure/tubes,/obj/item/weapon/crowbar,/obj/effect/decal/cleanable/blood/drip,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"D" = (/obj/effect/decal/cleanable/blood/footprints{tag = "icon-blood1 (NORTH)"; icon_state = "blood1"; dir = 1},/obj/machinery/door/airlock/survival_pod,/obj/structure/fans/tiny,/turf/open/floor/pod/dark{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface},/area/ruin/powered)
"E" = (/obj/structure/shuttle/engine/propulsion/burst{dir = 4},/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
"F" = (/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall12"},/area/ruin/powered)
"G" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall_f10"; layer = 2},/area/ruin/powered)
"H" = (/obj/machinery/door/airlock/shuttle{name = "Escape Pod Airlock"},/turf/open/floor/plasteel/shuttle,/area/ruin/powered)
"I" = (/obj/structure/chair{dir = 4},/turf/open/floor/plasteel/shuttle{baseturf = /turf/open/floor/plating/asteroid/basalt},/area/ruin/powered)
"J" = (/obj/structure/grille,/obj/structure/window/shuttle,/turf/open/floor/plating{baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300"},/area/ruin/powered)
"K" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/turf/closed/wall/shuttle{baseturf = /turf/open/floor/plating/lava/smooth/lava_land_surface; dir = 2; icon_state = "swall_f9"},/area/ruin/powered)
(1,1,1) = {"
a
a
a
a
a
a
a
a
s
s
s
s
s
s
s
s
"}
(2,1,1) = {"
a
a
a
a
a
a
a
a
a
a
s
s
s
s
s
s
"}
(3,1,1) = {"
a
a
a
a
a
a
a
a
a
a
s
s
s
s
s
s
"}
(4,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
s
s
s
s
s
"}
(5,1,1) = {"
a
a
a
a
a
b
c
b
t
t
t
t
t
s
s
s
"}
(6,1,1) = {"
a
a
a
a
b
b
n
n
t
v
x
B
t
s
s
s
"}
(7,1,1) = {"
a
a
a
b
b
m
o
o
t
w
y
y
D
s
s
s
"}
(8,1,1) = {"
a
b
b
b
c
f
o
q
o
o
z
C
t
s
s
s
"}
(9,1,1) = {"
b
b
f
i
g
f
f
o
o
o
t
t
t
s
s
s
"}
(10,1,1) = {"
b
d
g
j
g
g
f
f
u
o
A
b
a
s
s
s
"}
(11,1,1) = {"
c
e
h
g
l
c
p
r
c
c
c
b
a
a
s
s
"}
(12,1,1) = {"
b
b
f
k
f
b
b
b
b
a
a
a
a
E
H
E
"}
(13,1,1) = {"
a
b
b
b
b
b
a
a
a
a
a
a
a
F
I
F
"}
(14,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
F
I
F
"}
(15,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
G
J
K
"}
(16,1,1) = {"
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
a
aaaaaaaabbcbaaaa
aaaaaaabbdebbaaa
aaaaaaabfghfbaaa
aaaaaabbijgkbaaa
aaaaabbcgglfbaaa
aaaabbmffgcbbaaa
aaaacnooffpbaaaa
aaaabnoqofrbaaaa
saaatttooucbaaaa
saaatvwooocaaaaa
sssatxyztAcaaaaa
sssstByCtbbaaaaa
ssssttDttaaaaaaa
ssssssssssaEFFGa
sssssssssssHIIJa
sssssssssssEFFKa
"}
@@ -0,0 +1,16 @@
"a" = (/turf/template_noop,/area/template_noop)
"b" = (/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/template_noop)
"c" = (/obj/structure/alien/weeds,/obj/structure/alien/resin/wall,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/awaycontent/a7{name = "The Egg"})
"d" = (/obj/structure/alien/weeds,/obj/structure/alien/egg,/turf/open/floor/plating/asteroid/basalt/lava_land_surface,/area/awaycontent/a7{name = "The Egg"})
(1,1,1) = {"
aabbbbbaa
abbcccbba
bbcccccbb
bcccdcccb
bccdddccb
bcccdcccb
bbcccccbb
abbcccbba
aabbbbbaa
"}
File diff suppressed because it is too large Load Diff
-7
View File
@@ -7,10 +7,3 @@
# they will be able to right-click the top of the client to access these options. # #
# Case is not important for ckey. #
###################################################################################
aranclanos
cheridan
giacomand
rockdtben
MrStonedOne
Jordie0608
Dunc
+1
View File
@@ -466,6 +466,7 @@
max_fuel = 80
materials = list(MAT_METAL=70, MAT_GLASS=120)
origin_tech = "engineering=3;plasmatech=2"
w_class = 3
/obj/item/weapon/weldingtool/experimental
name = "experimental welding tool"
@@ -456,6 +456,8 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["backbag"] << backbag
S["species"] << pref_species.id
S["feature_mcolor"] << features["mcolor"]
S["feature_mcolor2"] << features["mcolor2"]
S["feature_mcolor3"] << features["mcolor3"]
S["feature_lizard_tail"] << features["tail_lizard"]
S["feature_human_tail"] << features["tail_human"]
S["feature_lizard_snout"] << features["snout"]
+42
View File
@@ -0,0 +1,42 @@
/obj/structure/reagent_dispensers/keg
name = "keg"
desc = "A keg."
icon_state = "keg"
var/reagent_type = "water"
/obj/structure/reagent_dispensers/keg/New()
..()
reagents.add_reagent(reagent_type,1000)
/obj/structure/reagent_dispensers/keg/blob_act()
qdel(src)
/obj/structure/reagent_dispensers/keg/mead
name = "keg of mead"
desc = "A keg of mead."
icon_state = "orangekeg"
reagent_type = "mead"
/obj/structure/reagent_dispensers/keg/aphro
name = "keg of aphrodisiac"
desc = "A keg of aphrodisiac."
icon_state = "pinkkeg"
reagent_type = "hornychem"
/obj/structure/reagent_dispensers/keg/milk
name = "keg of milk"
desc = "It's not quite what you were hoping for."
icon_state = "whitekeg"
reagent_type = "milk"
/obj/structure/reagent_dispensers/keg/semen
name = "keg of semen"
desc = "Dear lord, where did this even come from?"
icon_state = "whitekeg"
reagent_type = "semen"
/obj/structure/reagent_dispensers/keg/gargle
name = "keg of pan galactic gargleblaster"
desc = "A keg of... wow that's a long name."
icon_state = "bluekeg"
reagent_type = "gargleblaster"
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
+1
View File
@@ -1627,6 +1627,7 @@
#include "code\modules\projectiles\projectile\reusable.dm"
#include "code\modules\projectiles\projectile\special.dm"
#include "code\modules\reagents\chem_splash.dm"
#include "code\modules\reagents\kegs.dm"
#include "code\modules\reagents\reagent_containers.dm"
#include "code\modules\reagents\reagent_dispenser.dm"
#include "code\modules\reagents\chemistry\colors.dm"