Commit Graph
2934 Commits
Author SHA1 Message Date
joep van der velden 590ca6cd5d Fixes fireflashes
Fix fuel tanks going off multiple times.
Fix other reagents going off multiple times
Fireflashes now don't go through things they shouldn't be able to
2021-05-05 21:41:38 +02:00
PidgeyandGitHub e444ecbf97 Added Wasabi - a pungent spice found in basic nettles. (#15870) 2021-05-04 21:38:56 -04:00
SabreMLandGitHub 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
joep van der velden 70d201b312 Fix 3 runtimes.
Air alarms should be made to just use Init later on
2021-04-26 21:07:27 +02:00
dearmochiandGitHub 31a5d28db9 Fixes handheld chem dispenser reaching negative charge (#15933) 2021-04-25 15:00:00 +01:00
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
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
DennisandGitHub 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
SabreMLandGitHub b58fb29ec9 DIY Transformation Sting (#15821) 2021-04-06 13:58:07 +01:00
warriorstar-orionandGitHub 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
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
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 McCloudandGitHub 0dc46b7150 Merge pull request #15209 from SteelSlayer/spawn-removal
Removes a bunch of spawn()'s
2021-03-07 21:10:39 -05:00
SabreMLandGitHub 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 McCloudandGitHub fdc6ab2211 Damns Devils Gamemode to Hell (#15672)
* Damns Devils Gamemode to Hell

* Update config.txt
2021-03-07 12:00:02 +00:00
Fox McCloudandGitHub 926d484277 Moves External Organs to Nullspace (#15548)
* Moves External Organs to Nullspace

* additions

* oops

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

* Clarification
2021-03-02 09:30:18 +00:00
Fox McCloudandGitHub 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 McCloudandGitHub b49a99d46e Ports Physiology (#15449)
* Ports Physiology

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

* styling

* converts a species trait

* comment
2021-02-25 15:55:55 +00:00
Fox McCloudandGitHub 78cb60f160 Fixes Some Sounds Having Reverb (#15602)
* Fixes Some Sounds Having Reverb

* typeless
2021-02-24 09:34:34 +00:00
AzuleUtamaandGitHub 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
2b815dc11c Pill refactor and bug fixing (#15274)
* Removes spawn() when dissolve pill in reagent container

Also fixes some messages

* General pill refactor

Fix exploit allowing injection of reagents into pills
New() -> Initialize()
Third-person message upon dissolving pill no longer displays to the user, mimicking visible_message
Make all pill names improper, with the chemical capitalized
Fixes grammar in Haloperidol pill

* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Remove liquid requirement

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-02-21 21:42:23 +00:00
Fox McCloudandGitHub 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
SteelSlayerandGitHub 324af7454c oil slime logging (#15579) 2021-02-21 17:19:58 +00:00
RyalandGitHub d8ee628b3b Adds drugs to nukie med borg (#15517) 2021-02-16 11:36:44 +00:00
SteelSlayerandGitHub 915afa3c05 Update pyrotechnic.dm (#15526) 2021-02-14 11:04:34 +00:00
hal9000PR 2a2f69f6a3 sord 2021-02-05 21:56:41 +00:00
Fox McCloudandGitHub 8947e97f3b Refactors Electrocution and Tesla Zapping (#15357)
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
2021-02-03 20:52:03 +00:00
AffectedArc07 f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
sneksnekandGitHub fdb8b94c3c Adds mint, a new plant that can be processed into menthol (#15383)
* Update medicine.dm

* Update herbals.dm

* Update vending.dm

* added mint seeds

* added mint harvest

* added mint plant

* an attempt to fix the problem

the pr is having trouble with growing.dmi for some reason, i was told to do this

* another empty line for the above reason

* wow okay, be like that then

* no empty lines since you're bickering

* lets see if you like this

* forgot the mint chem in reagents/misc.dm

daily reminder that im a smooth brain

* made it green and distill into menthol

* made it goon

* moving it to the appropriate file

* moved to food.dm since it's a consumable

* clarification of new distilling result for desc
2021-01-30 16:53:51 -05:00
Fox McCloudandGitHub 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
f1ef0f99a3 Gives some tells to using holy water on vampire thralls. (#15329)
* Gives some tells to using holy water on vampire thralls

* henk's honking suggestion

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-01-24 13:33:43 +00:00
dearmochiandGitHub cc6c6d0389 Adds ability to color patch packs in ChemMaster (#15244) 2021-01-10 20:56:37 +00:00
23dfab1a49 Adds fernet, an alcoholic digestif drink into the game (#15188)
* Here comes the cuarteto train

* I think i fucked up here

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

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Fixing some spacing before SabreML eats my soul

* Removed the ice from the recipe since it's more of a RP chem

* This should work, less copy paste

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-01-10 19:44:13 +00:00
52df4f1355 Changes the reagents creation order in reagent_containers/New (#15255)
Co-authored-by: joep van der velden <15887760+farie82@users.noreply.github.com>
2021-01-07 11:13:30 +00:00
Mr.GustavoandGitHub 8349e75248 Fixes IV bags not letting you change transfer rate while buckled. (#15216)
Title.
2020-12-31 12:07:44 +00:00
AffectedArc07andGitHub 43ee2488c7 More New() -> Initialize() for /obj/structure (#15158)
* More New() -> Initialize() for /obj/structure

* Updates these

* Tweaks + Fixes
2020-12-29 10:42:39 -05:00
AffectedArc07andGitHub 8f72d7556e Annihilates the blackbox (#15132)
* Lets get this show on the road

* Now were talking

* These matter

* Oh the joys of CI testing

* And this

* Wrong version

* Tweaks

* More tweaks

* Lets document this

* This too

* Upgrades this

* Fixed some sanity issues

* This too

* Screw it, this too

* More sanity

* And these

* This too

* Documentation

* This too

* Fixes **awful** scoreboard logic

* Why do we care about only half-absorbing someone

* Revert "Why do we care about only half-absorbing someone"

This reverts commit 8de1cfdf05.

* Refactors these

* Hashing

* Moxian tweaks
2020-12-24 16:06:48 -05:00
e54fad8525 Nuka cola speed buff nerf (#14815)
* Nuka cola now gives radiation

* Moxian review

Co-authored-by: moxian <moxian@users.noreply.github.com>

* Nerf speed, remove radiation

Co-authored-by: moxian <moxian@users.noreply.github.com>
2020-12-22 11:19:03 -05:00
moxianandGitHub 1683c4271a Refactors renaming things with a pen. (#14960)
* Refactors renaming things with a pen.

* Farie review (thanks!!)

* Derp.

* Farie take 2
2020-12-16 14:43:15 -05:00
Farie82andGitHub 3a0cf40ca0 Makes cling and smuta transforms update your sec HUD (#15085) 2020-12-11 19:27:07 +00:00
dbc9f1b1cf Adds 2 new blob reagents, radioactive gel, and teslium paste. (#14865)
* Adds 2 new blob reagents

* slight change

* Colour change for complementary, slightly more chance for shocking, better grammer for shock messages.

* Apply suggestions from code review

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Nerfs the radioactive blob

* Adds blob effect desc, slightly nerfs the 2 new types

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2020-12-09 12:12:32 -05:00