Commit Graph

946 Commits

Author SHA1 Message Date
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
SteelSlayer
2045759348 Merge remote-tracking branch 'upstream/master' into wires-tgui 2020-07-19 23:20:20 -05:00
AffectedArc07
014dbd95d9 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-12 09:27:33 +01:00
Fox McCloud
1ec53a35b3 Merge pull request #13615 from TDSSS/xray-rnd
change tech requirement for xray implant
2020-07-07 13:41:58 -04:00
SteelSlayer
9cfd206885 tgui wires 2020-07-04 23:14:30 -05:00
SteelSlayer
7b6b9e8ddd Merge remote-tracking branch 'upstream/master' into IPC-buffs 2020-07-03 14:34:22 -05:00
AffectedArc07
748b8e88e1 Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-07-02 11:17:30 +01:00
Fox McCloud
c4143aedf0 Purges Rigs 2020-07-01 13:09:15 -04:00
Gatchapod
3e6ad37661 renaming it is a good idea, too 2020-07-01 05:25:49 +02:00
Gatchapod
94a77895bc We don't need it, do we? 2020-06-30 13:39:04 +02:00
Fox McCloud
92e3951efa TG Flying+Floating Refactor 2020-06-26 21:53:38 -04:00
AffectedArc07
a237d90f0f Merge branch 'master' into hook-kill-v10-final-ultimate-final 2020-06-26 12:30:43 +01:00
Fox McCloud
b3d69aac9b Moves to BYOND 513 (#13650)
* Fixes Orbiting

* moves to 513

* travis update

* check for minor version too
2020-06-26 01:15:59 -06:00
Fox McCloud
69de03a622 Gas Mixture Refactor (#13602)
* Gas Mixture Refactor

* derp

* defined turf types

* fixes

* cuts turf visuals cost in half

* even better equalizing with planetary atmos

* remove volatile fuel

* comment and documentatino on turf gas vars
2020-06-24 17:48:50 -06:00
Fox McCloud
006a4c9268 Merge pull request #13623 from trololiver112/Vision-fix
Fixes Shadowling darksight not giving night vision when toggled
2020-06-18 15:47:16 -04:00
Fox McCloud
75a8efa65c Updates Components (#13594)
* Updates Components

* signal documentation too

* minor fixes
2020-06-15 18:18:07 -06:00
trololiver112
e770103b72 commented 2020-06-15 22:17:22 +02:00
TDSSS
1c6234cf31 change tech requirement for xray implant 2020-06-14 19:55:23 +02:00
Fox McCloud
f4a0790514 Organ processing performance (#13534)
* Organ Processing Performance

* more optimization

* indentation error

* More OOP

* compensation buff
2020-06-07 14:29:52 -06:00
Fox McCloud
70b46d8aea Life refactor (#13471)
* Life Refactor WIP

* part 2

* part 3

* runtime fix

* newlines

* tweaks

* perspective checks

* fixes

* remote view tweaks

* more fixes

* robot fixes

* better updating

* cleaned up icon procs

* less proc call overhead

* performance gains

* more optimization

* shorter lists, removal of unecesary code

* gene OOP and dna styling cleanup

* oops

* axe disabilities

* typeless loop

* various tweaks and fixes

* brain checks

* runtime fixes

* cryo vision fixes
2020-06-03 19:43:30 -06:00
Fox McCloud
70ca3b0101 Helps Organs GC Better (#13506) 2020-05-30 15:04:44 -04:00
AffectedArc07
1676db7924 HOOKS ARE DEAD 2020-05-27 12:00:16 +01:00
Fox McCloud
bf796cf8fc Ports Cybernetic Ears (#13438)
* Ports Cybernetic Ears

* gosh darn new lines
2020-05-24 13:54:54 -04:00
Fox McCloud
798cf7a8be Removes Fat Sprites (#13430)
* Removes Fat Sprites

* fat vs chubby

* edge case
2020-05-23 03:10:39 -06:00
Fox McCloud
27bd6a9ec4 Shock Proof Heart (#13395) 2020-05-18 01:39:59 -06:00