Commit Graph
2771 Commits
Author SHA1 Message Date
variableundefinedandGitHub aa820ab123 Merge pull request #16291 from SabreML/brass
Craftable brass sheets
2021-08-13 23:40:03 -04:00
variableundefinedandGitHub d2d2af6a14 Merge pull request #15952 from farie82/runtime-fixes-6
Fixes 4 runtimes. Linked forum account message is now shown properly
2021-08-11 16:06:57 -04:00
SabreML bb82a58c8f Merge remote-tracking branch 'upstream/master' into brass 2021-08-04 19:32:12 +01:00
c8fdbc32ff Update code/modules/reagents/chemistry/reagents/drink_cold.dm
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:43:34 +01:00
90168d8d23 please be nice daddy github, we just want to fix indents
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:35:47 +01:00
824b3c4cfc tab indents r e e
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:27:49 +01:00
bcee469b58 tab indents r e e
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:27:40 +01:00
e633a7a20d tab indents r e e
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:27:31 +01:00
c9d5e525b7 tab indents r e e
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2021-07-28 15:27:19 +01:00
variableundefinedandGitHub fba7585b4e Revert "Increases most radiation dose amounts" (#16445) 2021-07-28 10:11:27 +01:00
SabreMLandGitHub e0d15d0f79 Trait Define Refactor (#16327)
* Adminordrazine fix

* Trait Define Refactor

* Fixes 1

* target.status_traits
2021-07-27 19:30:00 -04:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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 McCloudandGitHub 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
QwertytofortyandGitHub 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 McCloudandGitHub f5af21b794 Merge pull request #16213 from AffectedArc07/nukes-awful-code
Removes some oldcode
2021-07-07 09:57:16 -04:00
danni boiandGitHub a514834ab2 Merge branch 'ParadiseSS13:master' into newdrinks 2021-07-07 09:25:46 +01:00
danni-boy e5249a98ed tested n ready 2021-07-07 09:22:59 +01:00
S34NandGitHub 22b83565d2 damn rogue characters (#16309) 2021-07-05 18:28:18 +01:00
SabreML 4a3a726c76 Brass Construction 2021-07-03 10:40:03 +01:00
VallidianandGitHub 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
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
SabreMLandGitHub 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
QwertytofortyandGitHub 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
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
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-MonaRhgandGitHub 5dc1c472fe Better haloperidol (#15848) 2021-05-24 16:29:34 +01:00
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
SabreMLandGitHub 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 McCloudandGitHub bc41d93f36 Merge pull request #15811 from AffectedArc07/reagent-container-anchoring
Allows anchoring of fueltanks/watertanks/etc
2021-05-15 11:05:22 -04:00
joep van der velden 59f3c7b423 do_boom 2021-05-05 22:38:36 +02:00
joep van der velden 277c8e2ca6 More fixes
Moves logging around
Refactor of code
2021-05-05 22:17:09 +02:00
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