mirror of
https://github.com/yogstation13/Yogstation.git
synced 2025-02-26 09:04:50 +00:00
Merge remote-tracking branch 'origin/master' into luciee
This commit is contained in:
Katherine Kiefer
@@ -1,4 +1,4 @@
|
||||
FROM tgstation/byond:514.1566 as base
|
||||
FROM tgstation/byond:514.1583 as base
|
||||
|
||||
FROM base as build_base
|
||||
|
||||
|
||||
@@ -35,7 +35,7 @@ code tab of https://github.com/yogstation13/Yogstation
|
||||
(note: this will use a lot of bandwidth if you wish to update and is a lot of
|
||||
hassle if you want to make any changes at all, so it's not recommended.)
|
||||
|
||||
## The Yogstation codebase recommends compiling using version [514.1566](https://www.byond.com/download/build/514/514.1566_byond.exe) and may potentially NOT work on newer or older versions.
|
||||
## The Yogstation codebase recommends compiling using version [514.1583](https://www.byond.com/download/build/514/514.1583_byond.exe) and may potentially NOT work on newer or older versions.
|
||||
|
||||
## :exclamation: How to compile :exclamation:
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -58,7 +58,7 @@
|
||||
|
||||
//If you update these values, update the message in the #error
|
||||
#define MAX_BYOND_MAJOR 514
|
||||
#define MAX_BYOND_MINOR 1575
|
||||
#define MAX_BYOND_MINOR 1583
|
||||
|
||||
///Uncomment to bypass the max version check. Note: This will likely break the game, only use if you know what you're doing
|
||||
//#define IGNORE_MAX_BYOND_VERSION
|
||||
|
||||
@@ -19,6 +19,26 @@
|
||||
owner.hallucination = 0
|
||||
..()
|
||||
|
||||
/datum/brain_trauma/mild/reality_dissociation
|
||||
name = "Reality Dissociation Syndrome"
|
||||
desc = "Patient suffers from acute reality dissociation syndrome and experiences vivid hallucinations"
|
||||
scan_desc = "reality dissociation syndrome"
|
||||
gain_text = span_userdanger("...")
|
||||
lose_text = span_notice("You feel in tune with the world again.")
|
||||
random_gain = FALSE
|
||||
resilience = TRAUMA_RESILIENCE_ABSOLUTE
|
||||
|
||||
/datum/brain_trauma/mild/reality_dissociation/on_life()
|
||||
if(owner.reagents.has_reagent(/datum/reagent/toxin/mindbreaker, needs_metabolizing = TRUE))
|
||||
owner.hallucination = 0
|
||||
else if(prob(2))
|
||||
owner.hallucination += rand(10, 25)
|
||||
..()
|
||||
|
||||
/datum/brain_trauma/mild/reality_dissociation/on_lose()
|
||||
owner.hallucination = 0
|
||||
..()
|
||||
|
||||
/datum/brain_trauma/mild/stuttering
|
||||
name = "Stuttering"
|
||||
desc = "Patient can't speak properly."
|
||||
|
||||
@@ -417,19 +417,14 @@
|
||||
desc = "You suffer from a severe disorder that causes very vivid hallucinations. Mindbreaker toxin can suppress its effects, and you are immune to mindbreaker's hallucinogenic properties. <b>This is not a license to grief.</b>"
|
||||
value = -2
|
||||
//no mob trait because it's handled uniquely
|
||||
gain_text = span_userdanger("...")
|
||||
lose_text = span_notice("You feel in tune with the world again.")
|
||||
gain_text = null //handled by trauma
|
||||
lose_text = null
|
||||
medical_record_text = "Patient suffers from acute Reality Dissociation Syndrome and experiences vivid hallucinations."
|
||||
|
||||
/datum/quirk/insanity/on_process()
|
||||
if(quirk_holder.reagents.has_reagent(/datum/reagent/toxin/mindbreaker, needs_metabolizing = TRUE))
|
||||
quirk_holder.hallucination = 0
|
||||
return
|
||||
if(prob(2)) //we'll all be mad soon enough
|
||||
madness()
|
||||
|
||||
/datum/quirk/insanity/proc/madness()
|
||||
quirk_holder.hallucination += rand(10, 25)
|
||||
/datum/quirk/insanity/add()
|
||||
var/datum/brain_trauma/mild/reality_dissociation/T = new()
|
||||
var/mob/living/carbon/human/H = quirk_holder
|
||||
H.gain_trauma(T, TRAUMA_RESILIENCE_ABSOLUTE)
|
||||
|
||||
/datum/quirk/insanity/post_add() //I don't /think/ we'll need this but for newbies who think "roleplay as insane" = "license to kill" it's probably a good thing to have
|
||||
if(!quirk_holder.mind || quirk_holder.mind.special_role)
|
||||
|
||||
@@ -524,13 +524,17 @@
|
||||
|
||||
var/olddir = C.dir
|
||||
C.moving_diagonally = 0 //If this was part of diagonal move slipping will stop it.
|
||||
var/wagging = FALSE
|
||||
if(C.dna.species.is_wagging_tail())
|
||||
wagging = TRUE
|
||||
if(!(lube & SLIDE_ICE))
|
||||
C.Knockdown(knockdown_amount)
|
||||
C.Stun(stun_amount)
|
||||
C.stop_pulling()
|
||||
else
|
||||
C.Knockdown(20)
|
||||
|
||||
if(wagging)
|
||||
C.dna.species.start_wagging_tail(src)
|
||||
if(buckled_obj)
|
||||
buckled_obj.unbuckle_mob(C)
|
||||
lube |= SLIDE_ICE
|
||||
|
||||
@@ -239,9 +239,9 @@
|
||||
P.fire(dir2angle(dir))
|
||||
if(!manual)
|
||||
last_shot = world.time
|
||||
if(shot_number >= shots_before_reload)
|
||||
shot_number++
|
||||
if(shot_number < shots_before_reload)
|
||||
fire_delay = delay_between_shots
|
||||
shot_number ++
|
||||
else
|
||||
fire_delay = rand(minimum_reload_time,maximum_reload_time)
|
||||
shot_number = 0
|
||||
|
||||
@@ -228,13 +228,14 @@
|
||||
|
||||
/datum/reagent/toxin/mindbreaker
|
||||
name = "Mindbreaker Toxin"
|
||||
description = "A powerful hallucinogen. Not a thing to be messed with. For some mental patients. it counteracts their symptoms and anchors them to reality."
|
||||
description = "A powerful hallucinogen. Not a thing to be messed with. For some mental patients, it counteracts their symptoms and anchors them to reality."
|
||||
color = "#B31008" // rgb: 139, 166, 233
|
||||
toxpwr = 0
|
||||
taste_description = "sourness"
|
||||
|
||||
/datum/reagent/toxin/mindbreaker/on_mob_life(mob/living/carbon/M)
|
||||
M.hallucination += 5
|
||||
if(!M.has_trauma_type(/datum/brain_trauma/mild/reality_dissociation))
|
||||
M.hallucination += 5
|
||||
return ..()
|
||||
|
||||
/datum/reagent/toxin/plantbgone
|
||||
|
||||
@@ -58,6 +58,71 @@
|
||||
-->
|
||||
<div class="commit sansserif">
|
||||
|
||||
<h2 class="date">17 April 2022</h2>
|
||||
<h3 class="author">Alagoinha updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="imageadd">hexane canister sprite</li>
|
||||
<li class="imageadd">halon canister sprite</li>
|
||||
<li class="imageadd">pluonium canister sprite</li>
|
||||
<li class="imageadd">zauker canister sprite</li>
|
||||
<li class="imageadd">healium canister sprite</li>
|
||||
</ul>
|
||||
<h3 class="author">Chubbygummibear updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">New Donator Item: Sad Horn, it's a bike horn that plays the boo-womp sound</li>
|
||||
<li class="soundadd">boowomp.ogg is canon</li>
|
||||
<li class="rscadd">New radiation treatment chem: RadAway. A radioactive contamination scrubbing chem that can clean contamination (the green glow) off of items and people that are sprayed or splashed with it</li>
|
||||
<li class="tweak">The lavaland ruin that had a bottle of potassium iodide renamed rad-away gets a bottle of this RadAway instead</li>
|
||||
<li class="bugfix">Pods only get 2x light healing from sugar while it's processing</li>
|
||||
</ul>
|
||||
<h3 class="author">JamieD1 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Changed the direction of the camera in genetics which was annoying me so much that I had to open fastdmm2 to alter its position from the stupid glass to the more solid wall, now people in genetics will not shat their pants when they look at it and in future will be happy they are being watched by a camera and not bemused by the lack of phyyyyyysics holding up the camera when they break the glass.</li>
|
||||
<li class="tweak">Slips no longer stop tails wagging</li>
|
||||
</ul>
|
||||
<h3 class="author">Mqiib updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">changes a bunch of hunter-fu stuff to be in-line with the rest of our martial arts</li>
|
||||
<li class="tweak">Most martial arts attacks now respect species punch damage modifications more or less depending on the attack used</li>
|
||||
<li class="experiment">The Ingot has found a new recipe, I hope you're hungry...</li>
|
||||
<li class="tweak">Assault cyborgs are no longer stunned by flashes or flashbangs.</li>
|
||||
</ul>
|
||||
<h3 class="author">Readystorm546 updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added more wheelchairs and rolling beds and iv drips in the new storage closet.</li>
|
||||
<li class="rscadd">Moved Psyc office to where old gift shop used to be. Psyc office is now bigger</li>
|
||||
<li class="rscdel">Removed the rolling beds, wheelchairs, and iv drips that were in the hallways of medical.</li>
|
||||
<li class="rscdel">Removed old shop maintenance area</li>
|
||||
<li class="bugfix">Janitor closet turf was no in the janitor closet.</li>
|
||||
</ul>
|
||||
<h3 class="author">SapphicOverload updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">mindbreaker toxin no longer causes hallucinations if you have reality dissociation syndrome</li>
|
||||
<li class="tweak">made reality dissociation syndrome a brain trauma unique to the quirk</li>
|
||||
</ul>
|
||||
<h3 class="author">Sniblet updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Being punched by a combat mech now knocks you off your feet and throws you across the room instead of sleeping you</li>
|
||||
</ul>
|
||||
<h3 class="author">SomeguyManperson updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">the KA damage aoe no longer disrespects pressure damage reduction</li>
|
||||
</ul>
|
||||
<h3 class="author">TheGamerdk updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">AI is no longer blinded when their APC goes offline, provided they have another core online</li>
|
||||
<li class="bugfix">AI can restore their APC when it is offline</li>
|
||||
</ul>
|
||||
<h3 class="author">ToasterBiome updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">re-adds the autopsy surgery area for detective and the incinerator expansion on box</li>
|
||||
</ul>
|
||||
<h3 class="author">adamsong updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">fixed a runtime when checking if a mob is a clockie</li>
|
||||
<li class="tweak">pod people no longer process alcohol faster</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">16 April 2022</h2>
|
||||
<h3 class="author">Altoids updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
@@ -1567,26 +1632,6 @@
|
||||
<li class="tweak">reworks stun batons to focus more on stamina damage over the paralysis</li>
|
||||
<li class="tweak">stun batons are now effected by energy armor</li>
|
||||
</ul>
|
||||
|
||||
<h2 class="date">16 January 2022</h2>
|
||||
<h3 class="author"> Xoxeyos updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">New coolant loop for the AI and updated consoles for AI interaction.</li>
|
||||
<li class="tweak">Eclipse AI core atmospherics should work better.</li>
|
||||
</ul>
|
||||
<h3 class="author">KillerOrcaCora updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="tweak">Makes the syndcute wepons book only 2 TC insteed of 4 TC</li>
|
||||
</ul>
|
||||
<h3 class="author">SomeguyManperson updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="bugfix">bloodsucking from braindeads now actually gives reduced blood</li>
|
||||
</ul>
|
||||
<h3 class="author">adamsong updated:</h3>
|
||||
<ul class="changes bgimages16">
|
||||
<li class="rscadd">Added proc to spawn an emergency bar</li>
|
||||
<li class="bugfix">fixed a runtime that prevents the bar from spawning</li>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<b>GoonStation 13 Development Team</b>
|
||||
|
||||
@@ -30915,3 +30915,63 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
|
||||
- bugfix: fixed disconnect panel runtime
|
||||
- bugfix: fixed fingerprints not working properly when gloves aren't gloves
|
||||
- bugfix: fixed a runtime in the config/status world topic
|
||||
2022-04-17:
|
||||
Alagoinha:
|
||||
- imageadd: hexane canister sprite
|
||||
- imageadd: halon canister sprite
|
||||
- imageadd: pluonium canister sprite
|
||||
- imageadd: zauker canister sprite
|
||||
- imageadd: healium canister sprite
|
||||
Chubbygummibear:
|
||||
- rscadd: 'New Donator Item: Sad Horn, it''s a bike horn that plays the boo-womp
|
||||
sound'
|
||||
- soundadd: boowomp.ogg is canon
|
||||
- rscadd: 'New radiation treatment chem: RadAway. A radioactive contamination scrubbing
|
||||
chem that can clean contamination (the green glow) off of items and people that
|
||||
are sprayed or splashed with it'
|
||||
- tweak: The lavaland ruin that had a bottle of potassium iodide renamed rad-away
|
||||
gets a bottle of this RadAway instead
|
||||
- bugfix: Pods only get 2x light healing from sugar while it's processing
|
||||
JamieD1:
|
||||
- tweak: Changed the direction of the camera in genetics which was annoying me so
|
||||
much that I had to open fastdmm2 to alter its position from the stupid glass
|
||||
to the more solid wall, now people in genetics will not shat their pants when
|
||||
they look at it and in future will be happy they are being watched by a camera
|
||||
and not bemused by the lack of phyyyyyysics holding up the camera when they
|
||||
break the glass.
|
||||
- tweak: Slips no longer stop tails wagging
|
||||
Mqiib:
|
||||
- bugfix: changes a bunch of hunter-fu stuff to be in-line with the rest of our
|
||||
martial arts
|
||||
- tweak: Most martial arts attacks now respect species punch damage modifications
|
||||
more or less depending on the attack used
|
||||
- experiment: The Ingot has found a new recipe, I hope you're hungry...
|
||||
- tweak: Assault cyborgs are no longer stunned by flashes or flashbangs.
|
||||
Readystorm546:
|
||||
- rscadd: Added more wheelchairs and rolling beds and iv drips in the new storage
|
||||
closet.
|
||||
- rscadd: Moved Psyc office to where old gift shop used to be. Psyc office is now
|
||||
bigger
|
||||
- rscdel: Removed the rolling beds, wheelchairs, and iv drips that were in the hallways
|
||||
of medical.
|
||||
- rscdel: Removed old shop maintenance area
|
||||
- bugfix: Janitor closet turf was no in the janitor closet.
|
||||
SapphicOverload:
|
||||
- bugfix: mindbreaker toxin no longer causes hallucinations if you have reality
|
||||
dissociation syndrome
|
||||
- tweak: made reality dissociation syndrome a brain trauma unique to the quirk
|
||||
Sniblet:
|
||||
- tweak: Being punched by a combat mech now knocks you off your feet and throws
|
||||
you across the room instead of sleeping you
|
||||
SomeguyManperson:
|
||||
- bugfix: the KA damage aoe no longer disrespects pressure damage reduction
|
||||
TheGamerdk:
|
||||
- tweak: AI is no longer blinded when their APC goes offline, provided they have
|
||||
another core online
|
||||
- bugfix: AI can restore their APC when it is offline
|
||||
ToasterBiome:
|
||||
- rscadd: re-adds the autopsy surgery area for detective and the incinerator expansion
|
||||
on box
|
||||
adamsong:
|
||||
- bugfix: fixed a runtime when checking if a mob is a clockie
|
||||
- tweak: pod people no longer process alcohol faster
|
||||
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "Mqiib"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "Assault cyborgs are no longer stunned by flashes or flashbangs."
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "adamsong"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "fixed a runtime when checking if a mob is a clockie"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "Sniblet"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "Being punched by a combat mech now knocks you off your feet and throws you across the room instead of sleeping you"
|
||||
@@ -1,5 +0,0 @@
|
||||
author: "Chubbygummibear"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "New radiation treatment chem: RadAway. A radioactive contamination scrubbing chem that can clean contamination (the green glow) off of items and people that are sprayed or splashed with it"
|
||||
- tweak: "The lavaland ruin that had a bottle of potassium iodide renamed rad-away gets a bottle of this RadAway instead"
|
||||
@@ -1,5 +0,0 @@
|
||||
author: "TheGamerdk"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "AI is no longer blinded when their APC goes offline, provided they have another core online"
|
||||
- bugfix: "AI can restore their APC when it is offline"
|
||||
@@ -1,6 +0,0 @@
|
||||
author: "Mqiib"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "changes a bunch of hunter-fu stuff to be in-line with the rest of our martial arts"
|
||||
- tweak: "Most martial arts attacks now respect species punch damage modifications more or less depending on the attack used"
|
||||
- experiment: "The Ingot has found a new recipe, I hope you're hungry..."
|
||||
@@ -1,8 +0,0 @@
|
||||
author: "Alagoinha"
|
||||
delete-after: true
|
||||
changes:
|
||||
- imageadd: "hexane canister sprite"
|
||||
- imageadd: "halon canister sprite"
|
||||
- imageadd: "pluonium canister sprite"
|
||||
- imageadd: "zauker canister sprite"
|
||||
- imageadd: "healium canister sprite"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "SomeguyManperson"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "the KA damage aoe no longer disrespects pressure damage reduction"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "Readystorm546"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "Janitor closet turf was no in the janitor closet."
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "ToasterBiome"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "re-adds the autopsy surgery area for detective and the incinerator expansion on box"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "Chubbygummibear"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "Pods only get 2x light healing from sugar while it's processing"
|
||||
@@ -1,4 +0,0 @@
|
||||
author: "adamsong"
|
||||
delete-after: true
|
||||
changes:
|
||||
- tweak: "pod people no longer process alcohol faster"
|
||||
@@ -1,5 +0,0 @@
|
||||
author: "Chubbygummibear"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "New Donator Item: Sad Horn, it's a bike horn that plays the boo-womp sound"
|
||||
- soundadd: "boowomp.ogg is canon"
|
||||
4
html/changelogs/AutoChangelog-pr-13758.yml
Normal file
4
html/changelogs/AutoChangelog-pr-13758.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "JamieD1"
|
||||
delete-after: true
|
||||
changes:
|
||||
- rscadd: "Updates Max Byond to 1583"
|
||||
4
html/changelogs/AutoChangelog-pr-13760.yml
Normal file
4
html/changelogs/AutoChangelog-pr-13760.yml
Normal file
@@ -0,0 +1,4 @@
|
||||
author: "ToasterBiome"
|
||||
delete-after: true
|
||||
changes:
|
||||
- bugfix: "makes it so emitters arent always \"reloading\""
|
||||
Reference in New Issue
Block a user