Commit Graph

24544 Commits

Author SHA1 Message Date
Marm
6d1876a0fd Reworks CNS Implant + Emagged Upgraded Cybernetic Heart (#18202)
* just dodge

Changes all instances of anti_stun to anti_stam in the code in relation to the CNS implant. Reworks the CNS implant to protect against large bursts of stamina damage. Reworks the emagged upgraded cybernetic heart to cause the user to regen stamina passively. Disabler shots can now cause the emagged upgraded cybernetic heart to fail, causing heart attacks. Removes emagged upgraded cyberheart's ability to negate drowsiness and sleeping. The upgraded cybernetic heart now makes a passive heartbeat noise, much like the cursed heart.

* dodge dodge revolution

Lowers chance of heart attack. Removes audible heartbeat.

* boxed emp kit

* elaboration

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

Sure

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

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

Why not?

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* i finally got around to it

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-19 17:46:25 +01:00
Viz
491247089d stab and grab now viable (#18416) 2022-07-19 12:02:51 +01:00
FloFluoro
f13851f49c Fixes punctuation/grammar on various foods (#18447) 2022-07-19 12:01:41 +01:00
Viz
0da6c99dc8 Rebalances Krav Maga for Stamina Combat (#18404)
* STOMPS YOU STOMPS YOU STOMPS YOU

* i forgor
2022-07-19 12:01:29 +01:00
KalevTait
56d7f14817 simple animals (#18251) 2022-07-19 12:14:47 +02:00
Sirryan2002
8e6d00ea42 Library Fixes (#18414)
* library fixes

* apply code review suggestions

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-19 12:03:57 +02:00
Adrer
10fa94abd0 Reduces mindswap jitter time from 1000 to 10 (#18429)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-18 10:38:39 +01:00
SteelSlayer
d90235f4dd cryo afk popup fix (#18427) 2022-07-18 10:38:18 +01:00
S34N
cebd76bdcb Expanded cyberiad permabrig (#18272)
* prisoner rights are cool

* pass 2

* prisoner-witnessed killings

* improvements 3, wire mods

* pass 4

* i accidentally turned this sofa red, revert

* feedback pass

* deconflict

* scrubbers!

* purges tom

* minor tweaks

* merge conflict pt2

* bmon review

* tweaks

* holopads!

* lockdown completeness

* shuttle seat

* rwalls? why?

* return of the pyjama

* more tweaks

* lizard

* bmon review

* TOILETS
2022-07-17 23:31:59 +01:00
Viz
cb066d1dd9 disrespect (#18405) 2022-07-17 22:22:21 +01:00
Contrabang
0731101549 Gives cablecuffs and cables customizble colors, cablecuff(ed) sprites, and allows orange cables to spawn randomly (#18318)
* coloooors

* this should work

* bam, better colors

* fuck i didnt mean to delete the cueball

* cuffed state comment
2022-07-17 09:57:13 -05:00
KalevTait
694944e461 Code Readability - Power (#18245)
* power

* dissipate -> do_dissipate

* eye_protection =

* move APC charging #defines out of apc, and reference them in more places
2022-07-17 15:36:46 +01:00
Lumi
391a044df1 Grammar fixes (#18342)
* grammar fixes

cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -

* should fix the merge conflict

0 to FALSE

* unconflicts

panther will have to be fixed at a later date
2022-07-17 15:36:03 +01:00
Qwertytoforty
c2db9cbd65 Moves ED209 / security bots to stamina batons (#18232)
* Moves ED209 / security bots to stamina batons

* Buffs Bot health to compensate, secbots no longer have projs fly over them

* varset_callback
2022-07-17 15:32:27 +01:00
Bm0n
4da179b236 Disable BYOND macros and a few other things users shouldn't have access to. (#18374)
* time to die pickup macro

* code review
2022-07-17 13:30:43 +01:00
Sirryan2002
ac5f39f822 I am unhinged (#18393) 2022-07-17 11:53:48 +01:00
Viz
9596e6c9fc Zzztt... (#18389) 2022-07-17 11:53:34 +01:00
Christasmurf
51c1ef55ee Engineering Drip Lite™ (#18231)
* Merge remote-tracking branch 'upstream/master' into engiclothingpack

* In hand sprites

* satchel fitting
2022-07-16 20:39:26 -05:00
SteelSlayer
2881a03096 [TGUI] Biogenerator + refactor (#18263)
* tgui biogenerator

* moxian and sirryan review

* moxian review II

* charlie review
2022-07-16 22:41:57 +01:00
Adri
18a440a9bb Adjusts 15 berets and 9 other pieces of headwear to properly fit vox heads, part 1 (#18221)
* Chef hat fix

* Revert "Chef hat fix"

This reverts commit 645d08afdd.

* Alphabetizes vox head icons

* Repositions, recolors, and fixes vox headwear

* Adds code so the headgears actually show up

* Adds blockhair flag to bandana

* Revert "Adds blockhair flag to bandana"

This reverts commit ca47ba5000.

* Removes bandana vox code

* Removes the bandanas, will be done in another PR

* Removed superfluous sprite sheet declarations

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/clothing/head/misc.dm

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

* Update code/modules/customitems/item_defines.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 15:24:00 -05:00
Viz
a02909497a at long last this weapon is not bonkers (#18388) 2022-07-16 15:36:39 +01:00
Qwertytoforty
45f6f14c64 Now follow up with a glory kill (#18387) 2022-07-16 14:39:13 +01:00
Kugamo
3bfd1a6d8a Foggy Breath Effects (#18241)
* chilly

* frosty

* Now with crawling and buckling!

had to do some jank because meat spikes dont change a perfectly good variable that other angle changing code uses, so insert snowflake code for the meat spike. :C

* Fixes warning

what the hell is a protected variable anyways

* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* megafauna PR deconflict

* removes jank

* needless variable def
2022-07-16 00:45:45 -05:00
Farie82
b5c9a3bc79 Makes the lavaland shuttle not spawn space when destroyed. Makes shuttles not take space/lava/chasms with them on transit (#18194)
* Makes the lavaland shuttle not spawn space when destroyed
Makes shuttles not take space/lava/chasms with them on transit

* Ensures damaged shuttle turfs still can be repaired after launch
Makes sure flooring has proper icons set
2022-07-15 18:53:03 -05:00
Charlie
5e1ad2b560 Reworks disarms into shoves, mostly from TG (#18186)
* Disarm rework

* martial arts should work

* farie review

* bug fix + sound

* fixes all the things

* fixes diagonals

* fixes anchoring, buckling and adds feedback messages.

* fixes blockers ontop of tables

* grammar + tabling fix

* steel review
2022-07-15 13:14:38 -05:00
Charlie
707a92c46d Rebalances antistun chems (#18084)
* rebalances antistun chems

* missed some

* oops

* tweaks

* makes adrenals heal shock and heart failure

* typo

* moxian review

* aaaaaa

* I FORGOR

* steel review
2022-07-15 11:09:40 -05:00
Qwertytoforty
acc48358b4 Adds a new mecha-fauna to lavaland. Ready to TM (#17999)
* pain

* more progress

* progress continues

* more progress™️

* saving progress while I swap brances

* leg moving working for real, woo

* more saving as power goes out

* eeven more

* fix transfer

* More changes, closer to pr ready

* final stuff for night backup

* almost done™️

* almost done

* Final changes to get ready for posting

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* new sprite

* Loot added (minus crusher loot)

* Apply suggestions from code review

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

* Defines, loot, and requested changes, oh my!

* Apply suggestions from code review

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* sound, bluespace charge improvements, more text

* Update code/game/gamemodes/nuclear/pinpointer.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* WOOO CRUSHER ITEM

* don't code when dead tired kids

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>

* Makes crusher loot work, reworks shield for mecha fauna

* Names it, lets it spawn, buffs it, should be ready.

* Adds better sprites.

* pick to rand

* Buff, prevent cheese.

* Merge conflict hook test

* double checking to see if I installed it or not, think I need to manual

* fixes the merge issue

* makes gibtonite not yeet the mechafauna as much.

* fixes hostile/hostile fuckup

* fix most beam issues

* extra qdel insurance but it should be good

* fixes chasm issues, beep on self destruct, extra bluspace charge

* Shrinks the kaboom.

* spelling + beam fix

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* late_initialize, var names, and styling, oh my!

* attacl

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-15 15:28:07 +01:00
Contrabang
813e88a8cb Changes body collision to knockdown, adds a throw_range of 4 to carbon/human (#18363)
* Begone Weaken()

* throw range

* little spacin is good

* requested changes are changed
2022-07-15 15:16:23 +01:00
Viz
6eec8f9115 several skrell were hurt testing this (#18390) 2022-07-15 15:16:09 +01:00
Bm0n
dd1be67ebd Ports Goonstation solar panels (#18326)
* the goons have put me on their hitlist

* whoops i messed up the teg

* FORGOT TO REDELETE THE OLD TRACKER
2022-07-15 11:45:12 +01:00
Edan
166d7f3b61 Nerfs beanbags & rubber pellet shots (#18287)
* initial nerf

* rubber shot changes
2022-07-14 23:22:19 +01:00
Viz
a7300d6199 splash one awful gun (#18357) 2022-07-14 23:20:53 +01:00
Sinestia
81fa49b27f Makes plastic output vary based on inputs (#18359)
* Plastic is no longer a fixed-output reaction

* Buff plastic
2022-07-14 23:19:32 +01:00
Viz
bd80aa4e22 WAKE UP OUTTA YO SLEEP (#18360) 2022-07-14 23:18:39 +01:00
Qwertytoforty
b4677d2f06 You once again must stop drop and roll. (#18258) 2022-07-14 22:06:20 +01:00
LightFire53
9e72f9c5da Removes Nazi Germany Imagery from the Game (#18210)
* Invokes the Treaty of Versailles on Clowns

* Of course there were Vox sprites

* Conflicted
2022-07-14 17:15:34 +01:00
AffectedArc07
0c0b201668 Reworks anon dchat mode into full anon mode (#18282)
* Reworks anon dchat mode

* Update code/modules/client/preference/preferences_toggles.dm
2022-07-14 16:52:49 +01:00
Contrabang
69064951e9 goodbye oversight (#18375) 2022-07-14 12:32:43 +01:00
Contrabang
4ab98ea3f8 Cultists can now reliably find their cult dagger (#18367)
* cult find thing good

* return null

* extra space be gone
2022-07-14 11:01:02 +01:00
Sirryan2002
dcb4d43e5c Fixes Improper usage of tool_use_check proc (#18362)
* fix

* better implementation
2022-07-14 00:22:45 +01:00
SteelSlayer
f9b2a2b67e antag_datums GC fixes (#18321) 2022-07-14 00:22:25 +01:00
Kugamo
b0c73f77ff Adds unique sprites for orange jumpsuit (#18180)
* YAHOOO!

map edits + 6 dmis + 4 dm LETS GO

* Adds prionser uniform to loadout

* Revert "Adds prionser uniform to loadout"

This reverts commit d64f1d49ae9cc2bf96d0c68621642b638f3d0276.

* restores changes

* Steelslayer Review
2022-07-13 16:43:37 -05:00
S34N
3f95392c82 Lets go rebind things (#18166)
* SSinput Rewrite, Custom Keybindings

* hmm yes, safety

* azerty begone

* address AA and SteelSlayer

* Address the old man

* what

* CI dbconfig too

* Address TM issues

Unicode support
Better numpad support
Fix no perms message
Fix modifier screwing movement

* pre-TM tweak, nitfix

* pre TM change 2

* Display others

* MERGE ME

* unduplicates your rows

* reverts some changes, makes this work for now (not TM safe)

* fixes direction facing, removes hotkey help item

* weird keys

* TM commit revert later

* fixed asay/msay keybind

* adds ALL the emotes

* flip and spin

* makes old people happy

* and fixes admins not being able to msay

* lets borgs stow modules

* saves prefs when someone changes a keybind

* reverts skin changes and manually applies
HEAVEN HELP YOU IF YOU USE THE DM SKIN EDITOR IT BREAKS EVERYTHING

* tidies menu, unduplicates rest

* sql file pls come back

* Update SQL/updates/40-41.sql

* why did you not throw an error?!

* inits keybinds if your prefs somehow fail, i guess

* restores these spaces, i guess

* fixes local testing, i guess

* emote cooldown returns (oops)

* movement lock improvements

* Pageup does Swap Hands

* LOOC

* whisper for living mobs

* oops

* fix dsay

* fix IPC silicon emote hotkeys

* category name

* backspace only clears if input is focused

* Makes TAB and BACKSPACE rebindable

* charlie review

* define move

* yeet

* Lewcc review

* brings back legacy mode

* restores legacy mode

* tell legacy mode what is going on

* Update code/controllers/subsystem/input.dm

* Update code/controllers/subsystem/input.dm

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

* safeties!

* legacy mode is a pref now

* undo TM changes

* null prefs safeties

* Revert "legacy mode is a pref now"

This reverts commit b45af65139.

* revert this too thanks

Co-authored-by: mochi <shenesis@gmail.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-13 21:34:41 +01:00
Qwertytoforty
cce1071125 Moves unholy water to have stamina regen (#18349)
* that's an unholy amount of damage

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-13 21:17:17 +01:00
Sirryan2002
a2f89392cf Minor Code Cleanup + Adds Adjacency Check to Experimentor (#18355)
* polishes garbage

* :)
2022-07-13 18:15:57 +01:00
Sirryan2002
21749a73ed Fixes Improper usages of Accessory Procs (#18350)
* everyday I lose more brain cells

* better fix

* implementing requested changes
2022-07-13 18:11:23 +01:00
KalevTait
c043411b2f Code Readability - Atmospheric Pumps (#18151)
* pumps

* change pump_direction_releasing to releasing, and fix up maps
2022-07-12 23:57:08 -05:00
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
Sirryan2002
4ee78c346c Moves Seed Extractor to TGUI (#18068)
* improves the sextractor

* switches from model to numerical input

:)

* Apply suggestions from code review

update

fix

Co-Authored-By: moxian <moxian@users.noreply.github.com>

* fix maturation var

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

* changes variant stuff

* Apply suggestions from code review

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

* requested changes

* ui_act stuff

ui_act stuff

Co-authored-by: moxian <moxian@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-11 18:02:40 -05:00
Qwertytoforty
69a9206b78 Reworks the syndicate chainsaw (#18252)
* Reworks the syndicate chainsaw

* fixes merge conflict

* not work on dead people

* makes stun absorption removal respect stamina

* requested changes
2022-07-11 22:15:47 +01:00