Commit Graph

970 Commits

Author SHA1 Message Date
Qwertytoforty
e2793017bc preventions and fixes (#15726) 2021-04-05 17:46:43 +01:00
Sean Williams
08df09afb8 Cuffs now block arm implant use (#15825)
* no more implant interaction with cuffs

* delete pascal case
2021-04-05 15:49:35 +01:00
Adrer
4602b84d33 Diona/unbreakable limbs now properly augment children (#15826)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2021-04-05 15:47:20 +01:00
Qwertytoforty
9ee679cded Adds more magic items and spells to the wizard spellbook (#15036)
* touches more or less everthing that is magic

* Other changes I forgot to put in

* removes extra s

* nevermind lets not do drake form

* Apply suggestions from code review

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Better variable name

* Heart curse removed

* Re adds new stuff

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-03-14 10:15:05 +00:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
fdc6ab2211 Damns Devils Gamemode to Hell (#15672)
* Damns Devils Gamemode to Hell

* Update config.txt
2021-03-07 12:00:02 +00:00
Fox McCloud
8064242b75 Fixes Skrell Headpockets (#15660)
* Fixes Skrell Headpockets

* grammar fixes
2021-03-05 14:51:47 +00:00
Fox McCloud
926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
2021-03-03 21:34:49 +00:00
Fox McCloud
75935ff876 Converts Eye Augments to Cybernetic Eyes (#15519)
* Converts Eye Augments to Cybernetic Eyes

* literally not used

* it helps when you properly include all the code

* flashlight eyes

* tweaks

* conflict resolution

* can't have two eyes

* order of operations matters here

* autosurgeon
2021-03-03 20:21:30 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
Fox McCloud
c73cc5aa68 Refactors Organ Shocking To Use Signals (#15593)
* Refactors Organ Shocking To Use Signals

* proper source

* hush you
2021-02-26 18:43:11 +00:00
Fox McCloud
b49a99d46e Ports Physiology (#15449)
* Ports Physiology

* updates
2021-02-26 18:33:28 +00:00
Fox McCloud
efa3aecb61 Ports TG Pickup, Equip, and Drop Sounds (#15572)
* Ports TG Pickup, Equip, and Drop Sounds

* really
2021-02-24 12:51:59 +00:00
Fox McCloud
7b7ea0a191 Removes Deformed Sprites (#15588) 2021-02-24 12:45:58 +00:00
Fox McCloud
78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
Fox McCloud
02b9445b9b Refactors DNA Mutations; Refactors Mutations to use Traits (#15483)
* Refactors Mutations

* traits

* more work

* styling fix

* yet even more work

* oh hush

* almost there

* it continues yet further

* and that's genetics done

* and that's it folks

* last bit and golem fixup

* oof

* oops

* tweaks and fixes

* styling
2021-02-21 21:25:19 +00:00
Kyep
c9f587010e fix (#15467)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2021-02-07 21:33:11 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
Fox McCloud
003a1f7cba Tank Refactor; Breathing Retool (#15371)
* Tank Refactor Breathing Retool

* missed maps and doc

* just in case
2021-01-28 20:57:37 +00:00
Fox McCloud
de795c4e31 Radiation Refactor (#15331)
* First Commit

* visible radiation and engine goggles

* correction

* t-ray fix

* further adjustments and fixups

* gieger addition and cleaning fixup

* yet more fixes

* styling fixes

* fixes

* human glowing fix

* do the merge conflict avoidance dance

* Update supermatter.dm

* supermatter rads

* mapping in

* radiation doors

* yeah yeah line endings

* clean up

* styling issues

* showers
2021-01-24 22:03:13 +00:00
datlo
9e4061a796 Update grey translator implant to have a proper EMP effect (#15323)
* Add a proper emp_act to translator implant

Getting EMP'd as a grey with a translator now causes 20 brain damage and shuts down the translator for a minute.

* Remove brain damage
2021-01-24 13:34:49 +00:00
SabreML
5aeede675b Fixes one handed dswords (#15289)
* One handed deswords

* Reverts unintended changes

Got a bit confused, I need more coffee
2021-01-20 09:54:26 +00:00
Kyep
6d2c211688 Fixes organs_internal:295 runtime (#15171)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-12-22 18:08:10 +00:00
Qwertytoforty
dad7d8c08b Fixes vocal cords (#15116) 2020-12-15 18:56:26 +00:00
dearmochi
49853973e7 Buff EMPs against augments, remove duplicate external organ emp_act (buffs IPCs vs. EMPs) (#14813)
* Buff EMPs against augments, remove duplicate external organ emp_act

* Remove losebreath/toxloss
2020-12-09 12:15:27 -05:00
dearmochi
5edee29a50 [READY] Syndicate Contractors (#14605)
* Syndicate Contractors initial PR

* Finalize initial version

DNP

Finalize initial version

* Baton now costs 6 Rep, show dead extraction penalty, fix scroll

* Reduce total TC, add zippo, balloon, icon tweaks

* Address moxian, AA and Farie

* Fix mode.txt

* oops

* Address Farie 2

* Tweak baton to work around stam crits, address SteelSlayer

* Address TM issues, TP menu

* Fix wrongly merged DME

* Tick contractor DM files again

* Remove step_y

* TC rewards always higher than preceding difficulty's reward

* Address Farie

* Remove extraction_turf from handle_target_return

* fix doc

* Merge part2

* Address AA again
2020-12-09 12:03:23 -05:00
moxian
7069268be9 Minor HUD improvements
- skills HUD now shows assigned job
- adding security/medical comments works
- employment records no longer span five screens, and are trimmed
instead.
2020-11-09 06:07:20 +00:00
Qwertytoforty
e3ee0b01e8 Makes slimes have slime jelly for blood (#14665)
* Makes slimes have slime jelly for blood, reduces the healing and toxin effects of slime jelly

* Slime jelly is a diffrent colour so it does not look like blood, slime jelly iv bag added, said bag is now found in nanomed plus

* Makes slimes bleed in c o l o u r, makes iron affect exotic blood species.

* Makes slime blood always the same colour as skin, fixing dye and CMA issues

* Fixes iron mistake

* Fix henk stuff

Adds EXOTIC_COLOR trait, used if you want exotic blood to be coloured when splattering, in this case slime blood. Removes uneeded blood data stuff

* Update toxins.dm

* Fixes the black blood issue

By B-B-BLENDING the slime colour with a medium grey, it helps match the blood colour to the true colour of the slime way better, meaning that a default slime that looks grey (but techicaly has pitch black skin codewise) will have grey blood.

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/reagents/chemistry/reagents/toxins.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Signals for henk, fixes henks worries, less processing

* Fixes runtime

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/surgery/organs/blood.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

* Update code/modules/mob/living/carbon/human/species/slime.dm

Co-authored-by: farie82 <joepvelden@hotmail.com>

Co-authored-by: farie82 <joepvelden@hotmail.com>
2020-10-31 17:49:55 -04:00
warior4356
25da16d6d4 Merge branch 'master' into corporate-comms 2020-10-21 19:14:17 -07:00
Aquilar
8b8dd8f620 Adds a number of new implants (#14348)
* adds CNS jumpstarter, hacking arm, janitorial arm and botanical arm implants.

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>

* Update augments_internal.dm

* Update augments_internal.dm

* error correction.

* new name for jumpstarter

* Update augments_internal.dm

* grammar

* taking some suggestions.

* adding a safe spraycleaner for the implant.

* more suggestions

* evenmoarsuggestions

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>
2020-10-21 09:52:11 -04:00
Iren
a3d01c18f7 PR - Gender Update (#14406)
* PR - Gender Update

Gives Gender three states instead of two. This allows clones of tri-gendered species to properly carry their genders over to new bodies (e.g. Greys, Drask, etc.).

Tristate Gender Set Proc
Tristate Gender Get Proc
Fixes where Binary State was needed.

* Update update_icons.dm

Yeah, let's _not_ have Genderless folks get inconsistently gendered body part sprites (e.g. head, groin, torso mismatch).

* Update dna2.dm

* Update dna2.dm

* Update organ_icon.dm

* Update update_icons.dm

* Update dna2_helpers.dm

* Update organ_icon.dm

Readability (spacing)

* Update dna_injector.dm

* Update dna2.dm

* Changes made per Affected's requests.

Changes made per Affected's feedback.

* Update dna2.dm

Got our heads too deep in using this just for DNA_UI_GENDERr - returning the Set and Get procs to 0, 1, 2 as per Affected's request.

While in there, noticed some housekeeping items:
- reorganized the ranges so they flow numerically now
- changed the ranges so they don't overlap (line 205 having been the worst)
- removed the "else" statement from line 222 since we're using ASSERTS. There shouldn't be a value outside the range of 0 to 2 for this.
2020-10-21 09:45:44 -04:00
SabreML
668932c256 Makes 'Plastic Surgery' names include held ID Cards (#14168)
* Update plastic_surgery.dm

* Fix

Thanks to AA for basically writing the code for me.

* Added 'get_id_from_hands' proc

* Changed held ID check to use said proc

* ID cards on patients body are now also shown

Probably overthinking it as usual.

Also added a couple of comments.

* Tweaks
2020-10-17 18:42:15 -04:00
TDSSS
0498fcdb1e Buffs headpocket (#14611) 2020-10-17 13:25:02 -04:00
warior4356
8cd3448de4 Switches oversight from o to x. vocal cords are now ~ 2020-09-30 12:43:21 -07:00
RedWolfie
ca838d90f8 [Bugfix] Internal organs rot outside body (#14213)
* added processing of internal organs

* stop processing after insert organ

* refactor
2020-09-25 18:40:31 -04:00
Ryal
08c05a4814 Adds Earmuffs providing immunity to Changeling shriek (#14033)
* Adds Earmuff immunity to shriek

* Refactors hearing protection and adds deafness

* Update human.dm

* Removed implicit src
2020-09-20 18:32:27 -04:00
Qwertytoforty
f6b8fe5547 Makes CNS rebooter stun on EMP (#14234)
* Makes CNS rebooter stun on EMP

* Kyets requests

Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
2020-09-18 10:44:38 -04:00
Kyep
e135c2326b Terror Princess Rework (#13657)
* rework queen eggs, princess caste

* add trailing newlines for travis

* refactor for code standards

* Remove old/incorrect comment from queen.dm

* refactor purple.dm, add notification for which area queen is in

* princesses no longer lose ventcrawl or gain wallsmash when nesting, deletes MassFlicker()

* add status tab info for purples about where their queen is

* Simplified princess code: removed NestMode(), NestMode2().

* makes terrors use 'bite' animation when attacking something

* status tab spider regeneration helptext

* converts queen spit from TOX to BURN, empress single-fire

* fixes terror gender, double-examine text. add terrors closing airlocks, remove queen wrap

* newline for travis

* alter terror spider event balance depending on server pop

* white infection sequence: gray, red, brown, green, green

* moves #define isterrorspider(A) to __DEFINES\mobs.dm

* remove typoed comment

* fix: prevent exploit with spam-clicking egglay action button

* fix: prevent AI trying to move spiders after a player takes control of them

* fix bug where terrors bumping an airlock repeatedly could make it both open and close

* clarify comment on event odds

* increase queen spit burn damage from 30 to 40

* add: queen webs are now airtight, instead of dealing damage/hallucination

* remove spider alert for already-controlled spiders

* queen spit naming fix

* travis newline

* encourage princesses to remain outside vents

* fixes calls to CountSpidersDetailed not using list()

* makes it easier to debug away mission AI

* code quality: more typeless loops

* add: killing a queen, also kills most of her offspring

* remove walk fix, for splitting into another PR

* remove events\spider_terror.dm changes, move to another PR

* makes it compile - will still require merge conflict resolving later.

* fix: purple webs cause purples to lose sign of queen and die

* visible-> near for purples

* fix wrong gender on spiders

* queen spit now damages structures (like mechs) and other spiders

* ghost spacing

* show queen living time on examine

* Fixes #12969 - terrors getting stuck in web

* revert all changes to purple.dm

* farie requests 1

* farie refactoring II

* var/list/spider_array

* var/list/spider_totals

* more farie

* queen examine laycount, initial eggcount

* terror heat vulnerability, refactoring 1/0 vars

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-09-17 18:29:32 -04:00
TDSSS
328b7fa8d8 ERT idiotproofing and minor tweaks (#13834)
* makes ert more robust

* renamed and tweaked

* idiot proofing of ert

* I cannot into git, oops

* removed the anti-stun from code red erts again

* removed implied src
2020-09-16 16:38:25 -04:00
AffectedArc07
90fd9a8fb8 Removes all relative heresy (#13969)
Removes all relative heresy
2020-09-16 12:52:20 -04:00
AffectedArc07
73acdcb221 Merge pull request #12628 from SteelSlayer/IPC-buffs
IPC balance changes
2020-09-14 20:59:13 +01:00
SteelSlayer
6caf4cfebf Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-09-14 08:51:32 -05:00
SteelSlayer
f0fd61bb0d Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-09-10 17:20:35 -05:00
AffectedArc07
ebba3a322b Merge pull request #13703 from Fox-McCloud/tg-flying-floating-float-refactor
TG Flying+Floating Refactor
2020-08-27 20:08:35 +01:00
SteelSlayer
1b9ef55246 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-25 16:36:13 -05:00
AffectedArc07
ce0eb1fbdc Merge pull request #14003 from dearmochi/fix-lipsticks-draw-order
Fix colored lips drawing over masks and random lipstick colouring
2020-08-19 10:46:04 +01:00
SteelSlayer
609d252fa8 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-08-15 13:13:50 -05:00
AffectedArc07
0aa89bd3de Merge pull request #13748 from Fox-McCloud/rig-purge
Purges Rigs
2020-08-09 18:21:39 +01:00
mochi
cb97acd2da Fix lips drawing over masks 2020-08-03 17:47:57 +02:00
Aziz Chynaliev
12c031760a Fix runtime when 'item' is null during surgery germs spreading (#13975)
* Fix runtime when 'item' is null during germs spreading

* Change explicit null check to implicit

* Oops
2020-08-02 23:28:39 -06:00