Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into CarbonHydrogenBromine

This commit is contained in:
Tupinambis
2020-09-30 19:21:21 -05:00
37 changed files with 124 additions and 223 deletions
BIN
View File
Binary file not shown.
BIN
View File
Binary file not shown.
+1 -1
View File
@@ -267,7 +267,7 @@ GLOBAL_LIST_INIT(redacted_strings, list("\[REDACTED\]", "\[CLASSIFIED\]", "\[ARC
GLOBAL_LIST_INIT(wisdoms, world.file2list("strings/wisdoms.txt"))
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" ,"rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters"))
GLOBAL_LIST_INIT(speech_verbs, list("default","says","gibbers", "states", "chitters", "chimpers", "declares", "bellows", "buzzes" ,"beeps", "chirps" ,"hisses" ,"poofs" , "puffs", "rattles", "mewls" ,"barks", "blorbles", "squeaks", "squawks", "flutters", "warbles"))
GLOBAL_LIST_INIT(roundstart_tongues, list("default","human tongue" = /obj/item/organ/tongue, "lizard tongue" = /obj/item/organ/tongue/lizard, "skeleton tongue" = /obj/item/organ/tongue/bone, "fly tongue" = /obj/item/organ/tongue/fly, "ipc tongue" = /obj/item/organ/tongue/robot/ipc))
-3
View File
@@ -77,7 +77,6 @@ SUBSYSTEM_DEF(air)
/datum/controller/subsystem/air/proc/extools_update_ssair()
/datum/controller/subsystem/air/proc/extools_update_reactions()
/datum/controller/subsystem/air/proc/scan_for_active_turfs()
/datum/controller/subsystem/air/fire(resumed = 0)
var/timer = TICK_USAGE_REAL
@@ -165,8 +164,6 @@ SUBSYSTEM_DEF(air)
if(state != SS_RUNNING)
return
resumed = 0
if(get_amt_active_turfs() < 3000 && !TICK_CHECK)
scan_for_active_turfs()
currentpart = SSAIR_REBUILD_PIPENETS
+1 -1
View File
@@ -481,7 +481,7 @@ SAVEFILE UPDATING/VERSIONING - 'Simplified', or rather, more coder-friendly ~Car
S["hair_color"] >> hair_color
S["facial_hair_color"] >> facial_hair_color
S["left_eye_color"] >> left_eye_color
S["right_eye_color"] >> left_eye_color
S["right_eye_color"] >> right_eye_color
S["use_custom_skin_tone"] >> use_custom_skin_tone
S["skin_tone"] >> skin_tone
S["hair_style_name"] >> hair_style
+15
View File
@@ -227,6 +227,21 @@
return
else if(isinsect(C))
playsound(C, 'sound/voice/moth/mothlaugh.ogg', 50, 1)
else if(isjellyperson(C))
var/mob/living/carbon/human/H = C
if(H.dna.features["mam_ears"] == "Cat" || H.dna.features["mam_ears"] == "Cat, Big") //slime have cat ear. slime go nya.
playsound(C, pick('sound/voice/jelly/nyahaha1.ogg',
'sound/voice/jelly/nyahaha2.ogg',
'sound/voice/jelly/nyaha.ogg',
'sound/voice/jelly/nyahehe.ogg'),
50, 1)
return
else if(user.gender == FEMALE)
playsound(C, 'sound/voice/jelly/womanlaugh.ogg', 50, 1)
return
else
playsound(C, pick('sound/voice/jelly/manlaugh1.ogg', 'sound/voice/jelly/manlaugh2.ogg'), 50, 1)
return
else if(ishumanbasic(C))
if(user.gender == FEMALE)
playsound(C, 'sound/voice/human/womanlaugh.ogg', 50, 1)
+61 -151
View File
@@ -50,6 +50,67 @@
-->
<div class="commit sansserif">
<h2 class="date">01 October 2020</h2>
<h3 class="author">BlueWildrose updated:</h3>
<ul class="changes bgimages16">
<li class="soundadd">Slimepeople are given unique laughs and screams.</li>
<li class="tweak">Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs for character.</li>
</ul>
<h2 class="date">29 September 2020</h2>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixed a typo causing your right eye colour to save as the left eye colour</li>
</ul>
<h2 class="date">28 September 2020</h2>
<h3 class="author">ArchieBeepBoop updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Craftable Micro Powered Fans</li>
</ul>
<h3 class="author">Degirin2120 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added engineering hazard jumpsuits, can be found in the engidrobe, comes in 3 varieties.</li>
</ul>
<h3 class="author">Putnam3145 updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Added a brute-force check-every-single-tile step to SSair when it has enough time to run.</li>
<li class="balance">G fuid production is now much lower.</li>
<li class="rscdel">Supermatter sabotage objective's gone.</li>
<li class="balance">Subterfuge objectives are now all equally likely.</li>
<li class="spellcheck">Replaced a "(hopefully) 1" with a "2"</li>
<li class="tweak">Cryoing no longer unwins already-won objectives.</li>
</ul>
<h3 class="author">SiliconMain updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Minor adjustment to material cost of long range atmos analyzer</li>
</ul>
<h3 class="author">Trilbyspaceclone updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Most drinks now have some animation in them, from basic soda bubbles fizzing around to ice cubes bobbing just a bit.</li>
</ul>
<h3 class="author">Tupinambis updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Ghost poly's color value is now a hex value instead of an oct value. This has been a thing for OVER FIVE YEARS</li>
<li class="imageadd">Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).</li>
<li class="imageadd">Replaced old chair sprites with new ones ported and modified from eris.</li>
<li class="tweak">Beds can now be placed both right and left.</li>
<li class="tweak">Subtle changes to stool legs to give them more of a shine.</li>
</ul>
<h3 class="author">raspy-on-osu updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">TEG power generation</li>
</ul>
<h3 class="author">thakyZ updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Added the ability to print the Light Replacer at the Engineering Protolathe</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">turrets can once again be broken</li>
<li class="rscadd">you can now have heterochromia and select individual eye colours</li>
</ul>
<h2 class="date">27 September 2020</h2>
<h3 class="author">SiliconMain updated:</h3>
<ul class="changes bgimages16">
@@ -1080,157 +1141,6 @@
<ul class="changes bgimages16">
<li class="bugfix">monkeys no longer continuously bleed everywhere</li>
</ul>
<h2 class="date">30 July 2020</h2>
<h3 class="author">Adelphon updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Created a Cosmetic version of the camo.</li>
</ul>
<h3 class="author">Arturlang updated:</h3>
<ul class="changes bgimages16">
<li class="code_imp">Bloodsucker LifeTick runs from BiologicalLife now</li>
</ul>
<h3 class="author">Ryll-Ryll ported by silicons updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Shoelaces are now a thing. You can untie them by laying down next to someone.</li>
<li class="tweak">shoes now have lace delays and some can't be laced at all</li>
<li class="refactor">do after now tracks who's interacting with who, meaning some actions now break when the target moves away.</li>
</ul>
<h3 class="author">SiliconMain updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Ported the long range atmos analyzer from sk*rat, credit to NotRanged</li>
</ul>
<h3 class="author">silicons updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">energy sword perfect parries now reflect projectiles back at their shooters.</li>
<li class="balance">any mob can now parry if they have the right item</li>
<li class="rscadd">beam rifles now go into emitters properly</li>
<li class="refactor">clickdelay has been refactored into an experimental hybrid system. Check code/modules/mob/clickdelay.dm for more information.</li>
<li class="balance">Resisting no longer checks clickdelay, but is standardized to a 2 second per resist system for most forms of resisting. It still sets clickdelay, though.</li>
<li class="rscadd">Meters have been added for estimating time until next attack/resist. Won't be that useful due to our clickdelay currently being very short, though. They're visible from your hand and resist HUD elements. experimental: Most attacks and forms of attacking (minus unarmed because it's too much of a pain to refactor how hugs/gloves of the north star works) now check for time-since-last-attack rather than making it so you can't attack for said time. This means you can very quickly switch to a gun from a melee weapon, whereas in the old system a melee weapon would put you on lockout for 0.8 seconds, in the new system all the gun cares about is that you did not attack for at least 0.4 seconds.</li>
<li class="code_imp">All clickdelay setting/reading are now procs, so it should be trivial to implement another system where drawing/switching to a weapon requires you to have it out for x seconds before using it. I am not personally doing it at this point in time though because it will likely just annoy everyone with no real gain unless we do something like putting a 0.8 second switch-to cooldown for guns (which I did not, yet)</li>
<li class="refactor">attack_hand has been refactored to on_attack_hand remove: sexchems no longer impact click delay</li>
<li class="rscadd">turrets now automatically stagger their shots. Happy parrying/blocking.</li>
<li class="bugfix">turrets now speed_process, they were shooting slower than they should be</li>
<li class="balance">anything can now block with the right items</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">some crafted crates won't contain items now, and thus have stopped breaking the laws of physics</li>
<li class="tweak">beepskys hats now follow the laws of gravity and move up/down when he bobs up and down</li>
</ul>
<h2 class="date">29 July 2020</h2>
<h3 class="author">DeltaFire15 updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">The 'Naked' outfit is no longer broken.</li>
</ul>
<h3 class="author">Ghommie updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">fixed cremator trays, paleness examination strings, chat message for stamping paper, looping sounds, load away missions/VR admin verb, access requirements for using the sechuds.</li>
<li class="tweak">Alt-Clicking a cigarette packet should pull the lighter out first if present, then cigarettes.</li>
</ul>
<h3 class="author">Hatterhat updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">Directional windows can now be rotated counterclockwise properly again.</li>
</ul>
<h3 class="author">NecromancerAnne, Sirich96 updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Stunbaton sprites by Sirich96.</li>
<li class="rscadd">New sprites for the stunsword.</li>
</ul>
<h3 class="author">necromanceranne updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Adds some in-hands for the rapier sheath.</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">tail wagging should work in all cases now</li>
<li class="bugfix">bluespace jars work as intended now</li>
<li class="bugfix">aliens can remove embeds now</li>
<li class="bugfix">bloodsuckers are not affected by bloodloss</li>
</ul>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Flannel jackets and bartender winter coat</li>
</ul>
<h2 class="date">28 July 2020</h2>
<h3 class="author">Cacogen updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">OSHA has more pull than anyone could have expected. All armor provided by Nanotrasen and the syndicate now have tags that accurately lists defenses and resistances of a piece of clothing.</li>
</ul>
<h3 class="author">CameronWoof updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Exotic seed crates now contain a spaceman's trumpet seed packet.</li>
</ul>
<h3 class="author">EmeraldSundisk updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Renovates Snow Taxi's northeast bathroom to have multiple non-urinal toilets and showers</li>
<li class="rscadd">Adds signage/labeling to improve map readability</li>
<li class="rscadd">Adds a bathroom to the northwest station</li>
<li class="rscadd">Adds a filing cabinet to the cargo department</li>
<li class="tweak">Area designation adjustments to account for the above changes</li>
<li class="bugfix">Adds a missing airlock cyclelink near medical</li>
</ul>
<h3 class="author">Ludox235 updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Makes the flavour text that appears when you become a zombie tell you to act like one.</li>
</ul>
<h3 class="author">MrJWhit updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Decluttered toxins and hid the yellow mix line in atmos, for metastation</li>
</ul>
<h3 class="author">SiliconMain updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">Paramedic heirloom is now a zippo</li>
<li class="tweak">Durathread belts now protect their contents from radiation, and can hold full sized extinguishers</li>
</ul>
<h3 class="author">Sishen1542 updated:</h3>
<ul class="changes bgimages16">
<li class="rscdel">removed zoomba</li>
</ul>
<h3 class="author">dapnee updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">added a fan to the listening outpost</li>
<li class="bugfix">added two missing r-walls near the SM, removed random light and wire node below the engine, and fixed the missing cable in the courtroom on Kilo</li>
</ul>
<h3 class="author">kappa-sama updated:</h3>
<ul class="changes bgimages16">
<li class="balance">Stimpaks cost 5tc once more, up from 3tc.</li>
</ul>
<h3 class="author">silicons updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">polychromatic cloaks to loadout</li>
<li class="rscdel">no more self healing with medibeam guns</li>
<li class="balance">oh no, taser buff. alt fire delay dropped to 0.4 seconds.</li>
<li class="rscadd">you can now shoot yourself by disarm-intenting yourself with a gun.</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="tweak">species code is now slightly less messy</li>
<li class="bugfix">slight tweak to how material crafting works</li>
<li class="bugfix">changed up pet carriers / bluespace jars a bit so you can't fit certain things inside them and also the text shown for resist times is accurate</li>
</ul>
<h3 class="author">zeroisthebiggay updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Black Box theft objective</li>
</ul>
<h2 class="date">27 July 2020</h2>
<h3 class="author">Hatterhat updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">Training bokkens! Make 'em from wood, use 'em in-hand to toggle between harmful and not-so-harmful, practice your parrying with them!</li>
<li class="bugfix">Marker beacons should have a sprite again.</li>
</ul>
<h3 class="author">silicons updated:</h3>
<ul class="changes bgimages16">
<li class="rscadd">clownops and clown mobs now share the same faction. HONK!</li>
</ul>
<h3 class="author">timothyteakettle updated:</h3>
<ul class="changes bgimages16">
<li class="bugfix">modern pickle technology now allows people who have been turned into pickles, to be retrieved through the medical course of dying</li>
</ul>
</div>
<b>GoonStation 13 Development Team</b>
+41
View File
@@ -27376,3 +27376,44 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
SiliconMain:
- tweak: Holograms made from projectors (atmos, engi, sec, medical, ect...) can
no longer be contaminated by radiation
2020-09-28:
ArchieBeepBoop:
- rscadd: Craftable Micro Powered Fans
Degirin2120:
- rscadd: Added engineering hazard jumpsuits, can be found in the engidrobe, comes
in 3 varieties.
Putnam3145:
- tweak: Added a brute-force check-every-single-tile step to SSair when it has enough
time to run.
- balance: G fuid production is now much lower.
- rscdel: Supermatter sabotage objective's gone.
- balance: Subterfuge objectives are now all equally likely.
- spellcheck: Replaced a "(hopefully) 1" with a "2"
- tweak: Cryoing no longer unwins already-won objectives.
SiliconMain:
- tweak: Minor adjustment to material cost of long range atmos analyzer
Trilbyspaceclone:
- tweak: Most drinks now have some animation in them, from basic soda bubbles fizzing
around to ice cubes bobbing just a bit.
Tupinambis:
- bugfix: Ghost poly's color value is now a hex value instead of an oct value. This
has been a thing for OVER FIVE YEARS
- imageadd: Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris).
- imageadd: Replaced old chair sprites with new ones ported and modified from eris.
- tweak: Beds can now be placed both right and left.
- tweak: Subtle changes to stool legs to give them more of a shine.
raspy-on-osu:
- tweak: TEG power generation
thakyZ:
- rscadd: Added the ability to print the Light Replacer at the Engineering Protolathe
timothyteakettle:
- bugfix: turrets can once again be broken
- rscadd: you can now have heterochromia and select individual eye colours
2020-09-29:
timothyteakettle:
- bugfix: fixed a typo causing your right eye colour to save as the left eye colour
2020-10-01:
BlueWildrose:
- soundadd: Slimepeople are given unique laughs and screams.
- tweak: Adds "warbles", "chimpers", and "puffs" to the customizable speech verbs
for character.
@@ -1,4 +0,0 @@
author: "timothyteakettle"
delete-after: True
changes:
- rscadd: "you can now have heterochromia and select individual eye colours"
@@ -1,4 +0,0 @@
author: "ArchieBeepBoop"
delete-after: True
changes:
- rscadd: "Craftable Micro Powered Fans"
@@ -1,6 +0,0 @@
author: "Tupinambis"
delete-after: True
changes:
- imageadd: "Replaced old chair sprites with new ones ported and modified from eris."
- tweak: "Beds can now be placed both right and left."
- tweak: "Subtle changes to stool legs to give them more of a shine."
@@ -1,5 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- rscdel: "Supermatter sabotage objective's gone."
- balance: "Subterfuge objectives are now all equally likely."
@@ -1,4 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- balance: "G fuid production is now much lower."
@@ -1,4 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- spellcheck: "Replaced a \"(hopefully) 1\" with a \"2\""
@@ -1,4 +0,0 @@
author: "Tupinambis"
delete-after: True
changes:
- imageadd: "Updates TEG, Antimatter, Jetpack sprites (CO2 and Oxy from Eris)."
@@ -1,4 +0,0 @@
author: "Degirin2120"
delete-after: True
changes:
- rscadd: "Added engineering hazard jumpsuits, can be found in the engidrobe, comes in 3 varieties."
@@ -1,4 +0,0 @@
author: "thakyZ"
delete-after: True
changes:
- rscadd: "Added the ability to print the Light Replacer at the Engineering Protolathe"
@@ -1,4 +0,0 @@
author: "raspy-on-osu"
delete-after: True
changes:
- tweak: "TEG power generation"
@@ -1,4 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- tweak: "Cryoing no longer unwins already-won objectives."
@@ -1,4 +0,0 @@
author: "Trilbyspaceclone"
delete-after: True
changes:
- tweak: "Most drinks now have some animation in them, from basic soda bubbles fizzing around to ice cubes bobbing just a bit."
@@ -1,4 +0,0 @@
author: "SiliconMain"
delete-after: True
changes:
- tweak: "Minor adjustment to material cost of long range atmos analyzer"
@@ -1,4 +0,0 @@
author: "Putnam3145"
delete-after: True
changes:
- tweak: "Added a brute-force check-every-single-tile step to SSair when it has enough time to run."
@@ -1,4 +0,0 @@
author: "timothyteakettle"
delete-after: True
changes:
- bugfix: "turrets can once again be broken"
@@ -1,4 +0,0 @@
author: "Tupinambis"
delete-after: True
changes:
- bugfix: "Ghost poly's color value is now a hex value instead of an oct value. This has been a thing for OVER FIVE YEARS"
Binary file not shown.
@@ -42,6 +42,11 @@
sound = pick('modular_citadel/sound/voice/scream_m1.ogg', 'modular_citadel/sound/voice/scream_m2.ogg')
if(user.gender == FEMALE)
sound = pick('modular_citadel/sound/voice/scream_f1.ogg', 'modular_citadel/sound/voice/scream_f2.ogg')
if(is_species(user, /datum/species/jelly))
if(user.gender == FEMALE)
sound = pick('modular_citadel/sound/voice/scream_jelly_f1.ogg', 'modular_citadel/sound/voice/scream_jelly_f2.ogg')
else
sound = pick('modular_citadel/sound/voice/scream_jelly_m1.ogg', 'modular_citadel/sound/voice/scream_jelly_m2.ogg')
if(is_species(user, /datum/species/android) || is_species(user, /datum/species/synth) || is_species(user, /datum/species/ipc))
sound = 'modular_citadel/sound/voice/scream_silicon.ogg'
if(is_species(user, /datum/species/lizard))
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.