Commit Graph

2355 Commits

Author SHA1 Message Date
variableundefined
fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
SabreML
e0d15d0f79 Trait Define Refactor (#16327)
* Adminordrazine fix

* Trait Define Refactor

* Fixes 1

* target.status_traits
2021-07-27 19:30:00 -04:00
variableundefined
4915b39230 Merge pull request #16303 from FlattestGuitar/blur-me-up-scotty
Stab your eyes out with style
2021-07-26 21:50:35 -04:00
variableundefined
09a5988ce2 Merge pull request #16147 from S34NW/rad_damage_normalise
Increases most radiation dose amounts
2021-07-25 09:15:40 -04:00
Mieszko Jedrzejczak
8f24160317 revert initial eyeblur, add tg's plane master controllers 2021-07-13 18:02:54 +02:00
Fox McCloud
b6b510c2f9 Merge pull request #16284 from AffectedArc07/sorium-ldm-nerf
Nerfs sorium and LDM
2021-07-13 00:41:05 -04:00
AffectedArc07
702500af9f Fox fixes. Foxes? 2021-07-09 11:52:13 +01:00
Qwertytoforty
8dcb2c1a0f Prevents final summon rune by being cleaned by normal methods (#16224)
* Prevents final summon rune by being cleaned by normal methods

* Makes it a proc

* Moves cleanable, makes it work with space cleaner
2021-07-08 22:20:32 +01:00
Fox McCloud
f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code
Removes some oldcode
2021-07-07 09:57:16 -04:00
S34N
22b83565d2 damn rogue characters (#16309) 2021-07-05 18:28:18 +01:00
Vallidian
5a0eafb0a8 Adds adminfreeze drink (#15976)
* Adds adminfreeze drink

Adds a drink similar to Antifreeze called Adminfreeze as a bit of a meme. Requires an upgraded booze machine or a bottle of Nothing, ether from medbay, and some heat to create.
2 counts Vodka, 1 count Nothing, 1 count Ether.

* Removed BWOINK from taste description

Audio cue happens when mixed already.

* Updated adminfreeze drink

Changed sprite to not have the ADMIN on the side.
Changed the recipe to include a more difficult mixture.
1 count neuro-toxin, 1 count toxin special, 1 count fernet, 1 count moonshine, 1 count morphine

Adds a freeze effect and lowers body temp each sip.

Increased the alcohol percentage to 1.5 from .9

* reverted adminfreeze sprite to include ADMIN

After updating the recipe to make it harder to create, and popular opinion. Readded the ADMIN text to fully embrace the meme drink.
2021-07-02 18:00:32 +01:00
AffectedArc07
b85b672b9d Nerfs sorium and LDM 2021-07-02 13:51:18 +01:00
SabreML
c266b27aed Another small bugfix bundle (#16260)
* Closet examine

* Lit welder inhands

* Capitalisation

* Cyber organ eating

* Nukie reinforcements code

* Welding tool lathe cost

* Patch pack dropping

* Welding tool fix

* Spacing

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-06-26 22:57:27 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597)
* The the

* Some more

* Review 1

* A couple more
2021-06-20 10:20:32 -04:00
AffectedArc07
aed6fed004 Removes some oldcode 2021-06-19 18:56:48 +01:00
Qwertytoforty
5fb2ccbcfc Rebalences teslium blob slightly (#16119)
* part 1 of rework

* Finishes the rework for now

* Allows it to leave the body

* Makes it a proc
2021-06-17 15:47:31 +01:00
S34NW
2787fb14df Also fixes radiation causing reagents 2021-06-10 10:06:17 +01:00
Dragonkiller93
d4402f2ebb Cleaner no longer resets Light Tiles. (#16070)
* Cleaner no longer resets Light Tiles.

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

Spacing

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Creates a Clean proc, overrides it for light tile

* Forgot to fix this when copy pasting.

* Update code/game/turfs/turf.dm

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

* Update code/game/turfs/simulated/floor/light_floor.dm

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

* Update code/game/turfs/turf.dm

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

* Updates other files to match proc name

* Calls parent function instead of duplicating code.

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-06-08 15:04:28 +01:00
SabreML
9d10cf4260 Fixes soulstones ignoring DNR or AntagHUD settings (#16117)
* DNR/AntagHUD soulstoning

* Update code/game/gamemodes/wizard/soulstone.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

* Revive rune

Co-authored-by: dearmochi <shenesis@gmail.com>
2021-06-06 12:43:28 +01:00
E-MonaRhg
5dc1c472fe Better haloperidol (#15848) 2021-05-24 16:29:34 +01:00
SteelSlayer
e4bbd94d6a Robot_module and cyborg stack refactor (#13527)
* robot_module refactor

* some fixes

1. adds medical stacks of 25 for the syndi medical borg
2. fixes various construction steps that weren't using `use()` or `get_amount()`

* review tweaks + other stuff

1. Makes a bunch of for loops into istypeless loops
2. Adds a readout of the current out of stacks a borg has, in the status panel
3. Slightly reorganizes the medical, syndi medical, engineering and syndi engineering cyborgs items

* fixes after upstream merge

* blank line for travis

* fixes and improvements

1. Fixed welder icon's not updating periodically if you were charging in a borg recharger
2. Fixes solar panels dropping /cyborg type glass when they were deconstructed.
3. Band-aid fix (incase #2 doesn't fix this) for cyborg stack's `source` var being null which resulted in tons of "cannot read null.energy" runtimes

* more fixes + constructable frame runtime fix

* removes toy sword placeholder

remove comment

* remove these as well

* .amount to .get_amount(), really should have done this before

* refactors robot_upgrades to work with the new system

- more cleanup
- adds documentation
- fixed a bug I made where you could delete your robot stack via crafting

* moves some unemag logic to the module file, makes more loops typless

* farie review

* fox review

* affected review and more TM bugfixes

* fixes comment

Co-authored-by: SteelSlayer <SteelSlayer@users.noreply.github.com>
2021-05-24 16:24:25 +01:00
SabreML
3d6e072464 A lot more Cult fixes (#15161)
* Some fixes

1: ERT members can no longer be given as an assassinate/sacrifice antag objective.
2. Cultists attempting to teleport to a deleted rune will no longer be teleported into nullspace.
3. Re-ordered the cult Blood Rites spell code because it was bugging me. (sorry qwerty)

* Cult stuff

1: Cultists can no longer be chosen as a sacrifice target
2: Rune drawing is limited to one at a time (No spamming on one tile)
3: Removed some unneccesary `/improper`s from area names, for the cult Summoning locations
4: Changed a couple of colours to use defines

* QDELETED()

* Eye colour fix

* Reorganisation, Objectives, and Gender

The majority of the changes here are just reordering the procs, but there's a few fixes too:

1. Roundstart cultists now get given the 'servecult' objective.
2. Deconverting someone now removes their 'servecult' objective, so they won't be notified about target changes.
3. Stopped summoned ghosts from experiencing a spontaneous gender change.

* Screwdriver fix

* Prayer bead stripping

* Some more construct fixes

1: Fixed *all* holy constructs getting the 'Summon soulstone' ability
2: Fixed Wraiths getting their blue light reset to red after jaunting
3: Added a 'holy' variable to constructs, and made the holyification its own proc.

* qdeleted

* Construct Converting

Apparently you can convert holy constructs. Who knew!

* Another two weeks

Moved all the construct icon states to their own file, and fixed Nar'Sie constructs not getting a glowing effect.

* Grab fix

Fixed upgrading a grab having the ability to potentially transport the victim across dimensions.

* Not actually a cult fix but eh

Fixes: Runtime in outfit.dm, 114: bad number
And updates the cult corpse from legion spawns

* Teleport spell effect

Fixed the teleport effect for the spell being attached to the wrong mob.

* Small cleanup

* Eye colour cloning fix

* Veil Shifter

Fixed:
Runtime in cult_items.dm,355: pick() from empty list
Veil shifters not retaining any grabs after teleporting.

* Adjacent
2021-05-16 11:33:07 +01:00
Fox McCloud
bc41d93f36 Merge pull request #15811 from AffectedArc07/reagent-container-anchoring
Allows anchoring of fueltanks/watertanks/etc
2021-05-15 11:05:22 -04:00
Pidgey
e444ecbf97 Added Wasabi - a pungent spice found in basic nettles. (#15870) 2021-05-04 21:38:56 -04:00
SabreML
6481a50506 'Do Not Revive' verb for Ghosts (#15934)
* DNR

* Review things

Bound to be something I missed, but testing all seems to work fine.

* Aliven't
2021-05-02 15:42:56 +01:00
dearmochi
31a5d28db9 Fixes handheld chem dispenser reaching negative charge (#15933) 2021-04-25 15:00:00 +01:00
LordShekelstein
1453c244e5 Gives Greys FluoroSulphuric Acid immunity (#15909)
* Fixes Gloves of the North Star exploit.

* Update miscellaneous.dm

* Update miscellaneous.dm

* Create miscellaneous.dm

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* Update code/modules/clothing/gloves/miscellaneous.dm

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

* commit on 'master'

* commit on 'master'

* master

* 'singularityhammer'

* commit

* adds !isgray to facid

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-04-22 21:36:00 +01:00
Sirryan2002
3a12a54f20 Adds Ice to Daiquiri recipe (#15910)
* Adds Water to Daiquiri recipe

* fixing the recipe again

changes water to ice to prevent conflicts with grog (rum & water)

* Update code/modules/reagents/chemistry/recipes/drinks.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-04-19 12:27:54 +01:00
Dennis
1ae84f79f2 Moved nullified to own proc and reduced stacking effect of nullrod/prayer beads (#15809)
* Moved nullified to own proc and reduced stacking

* Fixed minor error.
2021-04-06 13:58:36 +01:00
SabreML
b58fb29ec9 DIY Transformation Sting (#15821) 2021-04-06 13:58:07 +01:00
warriorstar-orion
ea38c69633 Support 28 additional hats for corgis. (#15669)
- /obj/item/clothing/head/HoS
- /obj/item/clothing/head/HoS/beret
- /obj/item/clothing/head/beret/sec
- /obj/item/clothing/head/bowlerhat
- /obj/item/clothing/head/caphat/parade
- /obj/item/clothing/head/hardhat/dblue
- /obj/item/clothing/head/hardhat/orange
- /obj/item/clothing/head/hardhat/red
- /obj/item/clothing/head/helmet/roman
- /obj/item/clothing/head/justice_wig
- /obj/item/clothing/head/soft/black
- /obj/item/clothing/head/soft/blue
- /obj/item/clothing/head/soft/green
- /obj/item/clothing/head/soft/grey
- /obj/item/clothing/head/soft/mime
- /obj/item/clothing/head/soft/purple
- /obj/item/clothing/head/soft/rainbow
- /obj/item/clothing/head/soft/red
- /obj/item/clothing/head/soft/sec
- /obj/item/clothing/head/soft/yellow
- /obj/item/clothing/head/surgery/black
- /obj/item/clothing/head/surgery/blue
- /obj/item/clothing/head/surgery/green
- /obj/item/clothing/head/surgery/purple
- /obj/item/clothing/head/wizard/black
- /obj/item/clothing/head/wizard/magus
- /obj/item/clothing/head/wizard/marisa
- /obj/item/reagent_containers/glass/bucket
2021-04-05 17:44:51 +01:00
AffectedArc07
02c91122c3 Message tweak 2021-04-05 17:29:02 +01:00
AffectedArc07
7755b4f4b4 Update code/modules/reagents/reagent_dispenser.dm
Co-authored-by: Sean Williams <12197162+S34NW@users.noreply.github.com>
2021-04-02 13:54:24 +01:00
AffectedArc07
c89089a063 Examine text + Walltank support 2021-04-02 13:43:28 +01:00
AffectedArc07
446a26ada9 Allows anchoring of fueltanks/watertanks/etc 2021-04-02 13:21:44 +01:00
Ryal
e7310cac9b Adds missing things to drone cleaning (#15553)
* Adds missing things to drone cleaning.

* Update code/game/machinery/doors/airlock_electronics.dm

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

* Update code/game/machinery/doors/windowdoor.dm

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

* Update code/game/machinery/doors/airlock.dm

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

* Update code/game/machinery/doors/airlock.dm

Co-authored-by: dearmochi <shenesis@gmail.com>

* Moves destroyed electronics to emag_act

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: dearmochi <shenesis@gmail.com>
2021-03-28 12:45:29 +01:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
0dc46b7150 Merge pull request #15209 from SteelSlayer/spawn-removal
Removes a bunch of spawn()'s
2021-03-07 21:10:39 -05:00
SabreML
0fdcd9ca8f Makes Mugwort Tea remove harmful chems (#15651)
* Mugwort

Mugwort is a common name for several species of aromatic flowering plants in the genus Artemisia. In Europe, mugwort most often refers to the species Artemisia vulgaris, or common mugwort.

* I am very smart
2021-03-07 12:24:25 +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
926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

* further cleanup
2021-03-03 21:34:49 +00:00
SabreML
983d39925f Blood colouring in syringes (#15626)
* Blood reagent colours

* Clarification
2021-03-02 09:30:18 +00:00
Fox McCloud
f65c8994ce Broad TG Sound Update (#15608)
* Broad TG Sound Update

* jester update
2021-02-27 11:59:33 +00:00
SteelSlayer
e57d867df5 spawn removals 2021-02-26 23:02:16 -06:00
Fox McCloud
b49a99d46e Ports Physiology (#15449)
* Ports Physiology

* updates
2021-02-26 18:33:28 +00:00
TDSSS
5f69256a66 I said NANOMACHINES, SON (#15541) 2021-02-25 15:59:00 +00:00
Fox McCloud
07d505b33b Ports Biotypes (#15471)
* Ports Biotypes

* styling

* converts a species trait

* comment
2021-02-25 15:55:55 +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
AzuleUtama
204d58d06e Adds the Daquiri to the list of cocktails (#15453)
* drink and recipe added

* adds sprite
2021-02-23 11:53:24 +00:00
SabreML
1d766e91e2 Stable mustagen 2021-02-22 19:55:46 +00:00