Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul

This commit is contained in:
WanderingFox95
2021-09-27 18:15:34 +02:00
committed by GitHub
11 changed files with 247 additions and 180 deletions
+195 -135
View File
@@ -875,7 +875,8 @@
/area/service/cafeteria)
"cj" = (
/obj/effect/decal/cleanable/blood/old,
/obj/item/clothing/suit/space/syndicate/orange,
/obj/item/clothing/suit/space/syndicate/green/dark,
/obj/item/clothing/head/helmet/space/syndicate/green/dark,
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"ck" = (
@@ -1366,6 +1367,9 @@
dir = 1;
icon_state = "trimline_fill"
},
/mob/living/simple_animal/hostile/syndicate/melee/sword/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel,
/area/ruin/space/has_grav/skelter/nav)
"ds" = (
@@ -1895,6 +1899,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/clothing/head/helmet/space/syndicate/blue,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"eC" = (
@@ -2483,6 +2488,7 @@
/obj/structure/cable/yellow{
icon_state = "1-2"
},
/obj/item/clothing/head/helmet/space/syndicate,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"fR" = (
@@ -2581,6 +2587,7 @@
/obj/item/clothing/suit/space/syndicate/orange{
desc = "Wait, don't these normally come with a helmet?"
},
/obj/item/clothing/head/helmet/space/syndicate/orange,
/turf/open/floor/plating,
/area/ruin/space/has_grav/skelter/forehall)
"gg" = (
@@ -2726,6 +2733,7 @@
dir = 1;
pixel_y = -24
},
/obj/item/clothing/head/helmet/space/syndicate/green,
/turf/open/floor/carpet,
/area/ruin/space/has_grav/skelter/admin)
"gx" = (
@@ -2823,6 +2831,10 @@
/area/ruin/space/has_grav/skelter/engine/lower)
"gH" = (
/obj/structure/rack,
/obj/item/dnainjector/tonguespike{
desc = "It's a little suspicious.";
name = "suspicious serum"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"gI" = (
@@ -2907,18 +2919,18 @@
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/skelter/shields)
"gT" = (
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 8;
icon_state = "scrub_map_on-2"
},
/obj/structure/cable/yellow{
icon_state = "0-8"
},
/obj/machinery/power/apc{
cell_type = null;
dir = 1;
name = "Shield Room APC";
pixel_y = 23
},
/obj/machinery/atmospherics/components/unary/vent_scrubber{
dir = 8
},
/turf/open/floor/mineral/titanium/white,
/area/ruin/space/has_grav/skelter/shields)
"gU" = (
@@ -3136,7 +3148,9 @@
/obj/structure/cable/yellow{
icon_state = "1-8"
},
/turf/open/floor/mineral/titanium/white,
/turf/open/floor/plating/airless{
icon_state = "platingdmg1"
},
/area/ruin/space/has_grav/skelter/shields)
"hp" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden,
@@ -3325,7 +3339,9 @@
/obj/machinery/atmospherics/pipe/manifold/supply/hidden{
dir = 4
},
/turf/open/floor/mineral/titanium/white,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
/area/ruin/space/has_grav/skelter/shields)
"hO" = (
/obj/machinery/shieldgen,
@@ -3523,18 +3539,20 @@
/turf/open/floor/circuit,
/area/ruin/space/has_grav/skelter/shields)
"il" = (
/turf/open/floor/mineral/titanium/white,
/obj/structure/lattice,
/turf/open/space/basic,
/area/ruin/space/has_grav/skelter/shields)
"im" = (
/obj/machinery/atmospherics/components/unary/vent_pump/on{
dir = 1
},
/obj/machinery/light,
/obj/machinery/firealarm{
dir = 4;
pixel_x = 24
},
/turf/open/floor/mineral/titanium/white,
/obj/machinery/atmospherics/components/unary/vent_pump{
dir = 1
},
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
/area/ruin/space/has_grav/skelter/shields)
"in" = (
/turf/open/floor/plasteel{
@@ -3722,10 +3740,6 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/item/uplink/old{
pixel_x = -4;
pixel_y = 8
},
/obj/machinery/atmospherics/components/unary/vent_scrubber/on{
dir = 4;
icon_state = "scrub_map_on-2"
@@ -3839,7 +3853,10 @@
/area/ruin/space/has_grav/skelter/comms)
"iP" = (
/obj/structure/rack,
/obj/item/gun/ballistic/automatic/pistol,
/obj/item/book/granter/martial/cqc{
name = "dusty manual";
used = 1
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"iQ" = (
@@ -3874,20 +3891,6 @@
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/storage)
"iU" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
dir = 4
},
/obj/effect/turf_decal/tile/blue{
dir = 8
},
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/machinery/telecomms/relay/preset/auto,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iV" = (
/obj/structure/chair/comfy/teal,
/obj/effect/turf_decal/tile/blue,
@@ -3917,6 +3920,7 @@
/obj/item/clothing/suit/space/syndicate/black{
desc = "Wait, don't these normally come with a helmet?"
},
/obj/item/clothing/head/helmet/space/syndicate/black,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"iX" = (
@@ -4078,7 +4082,9 @@
/obj/effect/turf_decal/tile/blue{
dir = 1
},
/obj/machinery/telecomms/allinone,
/mob/living/simple_animal/hostile/syndicate/melee/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"jo" = (
@@ -4146,12 +4152,6 @@
/obj/item/gun/ballistic/automatic/pistol/no_mag,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"jw" = (
/turf/open/space/basic,
/area/space/nearstation)
"jx" = (
/turf/open/space/basic,
/area/template_noop)
"jy" = (
/obj/effect/turf_decal/tile/blue,
/obj/effect/turf_decal/tile/blue{
@@ -4166,6 +4166,66 @@
/obj/item/ammo_casing/c10mm,
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/comms)
"sg" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless,
/area/ruin/space/has_grav/skelter/shields)
"vv" = (
/mob/living/simple_animal/hostile/syndicate/melee/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/showroomfloor,
/area/ruin/space/has_grav/skelter/engine/powerstorage)
"vz" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular"
},
/turf/open/floor/plating/airless{
icon_state = "platingdmg3"
},
/area/ruin/space/has_grav/skelter/shields)
"AJ" = (
/turf/open/floor/plating/asteroid/airless,
/area/ruin/space/has_grav/skelter/shields)
"AR" = (
/mob/living/simple_animal/hostile/syndicate/ranged/shotgun/space{
name = "Impostrous Commando"
},
/turf/open/floor/plasteel/dark,
/area/ruin/space/has_grav/skelter/sec)
"JR" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless{
icon_state = "platingdmg2"
},
/area/ruin/space/has_grav/skelter/shields)
"Li" = (
/obj/machinery/atmospherics/pipe/simple/supply/hidden{
dir = 4
},
/obj/structure/lattice,
/turf/open/space/basic,
/area/ruin/space/has_grav/skelter/shields)
"OA" = (
/obj/structure/fluff/broken_flooring{
icon_state = "singular"
},
/turf/template_noop,
/area/template_noop)
"WM" = (
/obj/effect/turf_decal/weather,
/turf/open/floor/plating/airless,
/area/ruin/unpowered/no_grav)
"Zs" = (
/obj/item/shard{
icon_state = "medium"
},
/obj/structure/fluff/broken_flooring{
dir = 8;
icon_state = "pile"
},
/turf/template_noop,
/area/template_noop)
(1,1,1) = {"
ah
@@ -4483,7 +4543,7 @@ cF
cF
ex
eW
cF
AR
fN
gj
hJ
@@ -4525,7 +4585,7 @@ iI
iQ
iY
ji
jx
ah
"}
(13,1,1) = {"
ah
@@ -4549,7 +4609,7 @@ gj
iP
gl
hx
hx
vv
is
hx
eA
@@ -4705,7 +4765,7 @@ fV
hX
jb
jj
jw
ah
"}
(19,1,1) = {"
ah
@@ -4885,7 +4945,7 @@ gO
iT
jf
jk
jw
ah
"}
(25,1,1) = {"
ay
@@ -4942,7 +5002,7 @@ hH
ih
iG
iN
iU
iO
ii
jl
ah
@@ -5091,10 +5151,10 @@ hn
hM
ik
iH
gA
bx
ae
ah
gz
bL
bL
ak
ah
"}
(32,1,1) = {"
@@ -5118,13 +5178,13 @@ ga
gx
gR
ho
hM
Li
vz
il
il
gA
ae
ah
ah
sg
bL
ak
ak
ah
"}
(33,1,1) = {"
@@ -5150,12 +5210,12 @@ gS
hp
hN
im
gA
gU
ah
ah
ah
ah
sg
JR
ac
ak
ak
bq
"}
(34,1,1) = {"
ah
@@ -5179,13 +5239,13 @@ gz
gT
hq
hO
gA
gU
ah
ah
ah
ah
ah
gz
sg
WM
ac
ak
ak
cl
"}
(35,1,1) = {"
aS
@@ -5207,15 +5267,15 @@ dV
gd
gA
gU
gU
gU
gU
ah
ah
ah
ah
ah
ah
gz
AJ
gz
ac
ac
ac
ac
ak
aZ
"}
(36,1,1) = {"
ah
@@ -5237,15 +5297,15 @@ fI
ge
gB
gV
jw
ah
ah
ah
ah
ah
ah
ah
ah
aZ
ac
ak
ak
ac
ac
ac
ac
aZ
"}
(37,1,1) = {"
ah
@@ -5267,15 +5327,15 @@ cR
gf
ct
cR
ah
ah
ah
ah
ah
ah
ah
ah
ah
aZ
ak
ak
ak
ak
ac
ac
ac
Zs
"}
(38,1,1) = {"
ah
@@ -5296,16 +5356,16 @@ bx
dV
ct
ct
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
aZ
aZ
ac
ak
ak
ak
ak
ak
ac
aZ
"}
(39,1,1) = {"
ah
@@ -5326,16 +5386,16 @@ cu
cb
ae
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
ah
OA
cl
do
ac
ak
ak
ak
ac
aZ
aS
"}
(40,1,1) = {"
ah
@@ -5356,15 +5416,15 @@ fr
cc
ah
ah
do
aS
bq
ah
aZ
aZ
ah
ah
ah
ah
ah
ah
ah
ah
aZ
aS
ah
"}
(41,1,1) = {"
@@ -5387,13 +5447,13 @@ cc
ah
ah
ah
aZ
do
ah
ah
ah
ah
ah
ah
ah
do
aZ
ba
ah
ah
"}
@@ -5419,12 +5479,12 @@ ah
ah
ah
ah
bF
ah
ah
ah
ah
ah
ah
aZ
ah
"}
(43,1,1) = {"
@@ -5445,15 +5505,15 @@ ce
ce
ce
ah
aZ
cl
ah
ah
ah
aZ
aS
ah
ah
ah
ah
ah
ah
cl
ah
ah
"}
@@ -5476,7 +5536,7 @@ ah
ah
ah
ah
ah
bq
ah
ah
ah
+6
View File
@@ -331,6 +331,12 @@
name = "Space Diner"
description = "Come, traveler of the bluespace planes. Sit, enjoy a drink and take one of the fair maidens for a night. The exit is the way you came in, via that teleporter thingy, but do remember to stay safe."
/datum/map_template/ruin/space/suspicious
id = "helterskelter"
suffix = "skelter.dmm"
name = "Helter Skelter"
description = "You're looking mighty suspicious. Why don't you go and take a seat over in that driver?"
//Space ruins for the station z
/datum/map_template/ruin/spacenearstation
prefix = "_maps/RandomRuins/SpaceRuinsStation/"
@@ -7,11 +7,11 @@
instrument_flags = INSTRUMENT_LEGACY
volume_multiplier = 1 //not as loud as synth'd
/datum/instrument/hardcoded/accordian
name = "Accordian"
id = "accordian"
/datum/instrument/hardcoded/accordion
name = "Accordion"
id = "accordion"
legacy_instrument_ext = "mid"
legacy_instrument_path = "accordian"
legacy_instrument_path = "accordion"
/datum/instrument/hardcoded/bikehorn
name = "Bike Horn"
@@ -19,8 +19,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_hammond/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_hammond/c5.ogg')
/datum/instrument/organ/crisis_accordian
name = "Crisis Accordian"
/datum/instrument/organ/crisis_accordion
name = "Crisis Accordion"
id = "crack"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_accordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_accordian/c3.ogg',
@@ -34,8 +34,8 @@
"60"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c4.ogg',
"72"='sound/instruments/synthesis_samples/organ/crisis_harmonica/c5.ogg')
/datum/instrument/organ/crisis_tango_accordian
name = "Crisis Tango Accordian"
/datum/instrument/organ/crisis_tango_accordion
name = "Crisis Tango Accordion"
id = "crtango"
real_samples = list("36"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c2.ogg',
"48"='sound/instruments/synthesis_samples/organ/crisis_tangaccordian/c3.ogg',
@@ -166,7 +166,7 @@ GLOBAL_LIST_EMPTY(block_parry_data)
/// Clickdelay duration post-parry if you fail to parry an attack
var/parry_failed_clickcd_duration = 0 SECONDS
/// Parry cooldown post-parry if failed. This is ADDED to parry_cooldown!!!
var/parry_failed_cooldown_duration = 0 SECONDS
var/parry_failed_cooldown_duration = 3.5 SECONDS
// Advanced
/// Flags added to return value
@@ -136,7 +136,7 @@ GLOBAL_LIST_EMPTY(plague_rats)
if(LAZYLEN(GLOB.plague_rats) >= cap)
visible_message("<span class='warning'>[src] gnaws into its food, [cap] rats are now on the station!</span>")
return
var/mob/living/newmouse = new /mob/living/simple_animal/hostile/plaguerat(loc)
new /mob/living/simple_animal/hostile/plaguerat(loc)
visible_message("<span class='notice'>[src] gnaws into its food, attracting another rat!</span>")
/mob/living/simple_animal/hostile/plaguerat/proc/exit_vents()
+1
View File
@@ -53,3 +53,4 @@
#_maps/RandomRuins/SpaceRuins/spacehermit.dmm
#_maps/RandomRuins/SpaceRuins/advancedlab.dmm
#_maps/RandomRuins/SpaceRuins/spacediner.dmm
#_maps/RandomRuins/SpaceRuins/skelter.dmm
+19 -31
View File
@@ -50,6 +50,25 @@
-->
<div class="commit sansserif">
<h2 class="date">27 September 2021</h2>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">helter skelter actually spawns</li>
<li class="bugfix">code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning: newmouse: variable defined but not used</li>
</ul>
<h2 class="date">25 September 2021</h2>
<h3 class="author">buffyuwu updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixes accordions</li>
</ul>
<h2 class="date">24 September 2021</h2>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
<li class="balance">gremlins become shock immune</li>
</ul>
<h2 class="date">23 September 2021</h2>
<h3 class="author">KrabSpider updated:</h3>
<ul class="changes bgimages16">
@@ -523,37 +542,6 @@
<li class="bugfix">Generic fires work now</li>
<li class="balance">A knock-on effect of the HE pipe change is that space cooling is ~8.4x as powerful</li>
</ul>
<h2 class="date">26 July 2021</h2>
<h3 class="author">SandPoot updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">Removes a sneaky transform button on the vore panel.</li>
</ul>
<h2 class="date">24 July 2021</h2>
<h3 class="author">MrJWhit updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Replaces the northwest maint room on box with a sadness room</li>
<li class="rscadd">Replaces bar stripper room with an arcade on boxstation</li>
<li class="rscadd">Squished the west bathrooms a bit and made a room to sell things on boxstation.</li>
<li class="balance">Southeast maint hallway on box is now ziggy and zaggier.</li>
<li class="bugfix">Fixed pipes being not connected with the recent map PR for boxstation.</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">hallucination now bottoms out at 0</li>
<li class="balance">supermatter now causes only half the hallucinations</li>
</ul>
<h3 class="author">cadyn updated:</h3>
<ul class="changes bgimages16">
<li class="server">auxmos bump for dependencies.sh</li>
</ul>
<h2 class="date">23 July 2021</h2>
<h3 class="author">silicons updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Batons are slightly more powerful.</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>
+11
View File
@@ -30068,3 +30068,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- code_imp: cryogenics ain't a candidate for anomaly spawns anymore.
buffyuwu:
- rscadd: canvas and spray can are now sold in the fun vendor
2021-09-24:
zeroisthebiggay:
- balance: gremlins become shock immune
2021-09-25:
buffyuwu:
- bugfix: fixes accordions
2021-09-27:
zeroisthebiggay:
- bugfix: helter skelter actually spawns
- bugfix: 'code\modules\mob\living\simple_animal\hostile\plaguerat.dm:139:warning:
newmouse: variable defined but not used'
@@ -1,4 +0,0 @@
author: "zeroisthebiggay"
delete-after: True
changes:
- balance: "gremlins become shock immune"
@@ -0,0 +1,5 @@
author: "zeroisthebiggay"
delete-after: True
changes:
- balance: "helter skelter loot insanity"
- bugfix: "helter skelter comms insanity"