Commit Graph

39685 Commits

Author SHA1 Message Date
Contrabang
fd5580307e Adds a blue overlay to scrying orb users. Spirit realm and scrying orb users now have a special description instead of being catatonic (#18366)
* holy shit blue ghosts

* lets fix that

* you cant see it if its not in ya hand

* Their glowing red eyes are glazed over

* farie review

* farie review pt 2
2022-07-23 17:50:00 +02:00
LightFire53
18ef75f687 Adds a Gym to BoxStation Dormitories and Removes Exercised Buff/Bath Salts Malus (#18397)
* DO YOU EVEN LIFT?!!?

* You do not get THOSE gainz from punching

* In which I keep being code baby

* Baby steps

* The final touches

* KERCHOW!

GOTTA CHANNEL YOUR INNER MR. TORGUE WHEN MAKING COMMIT NAMES!

* WHO EVEN NEEDS DOORS ANYWAY

* Sean and Bmon

* THE ANTI-BUFF

* HEY, IT COMPILES

* IT COMPILES BABY!

* Apply suggestions from code review

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-23 15:34:01 +01:00
Contrabang
8770f443f8 Adds a better warning for when 60+ damage will be applied when thrown (#18400)
* okay clamps it

* Revert "okay clamps it"

This reverts commit 45dd6c2619.

* warning enabled, slowdown applied

* addresses, removes slowdown

* oops forgot that

* comment updated
2022-07-23 15:29:14 +01:00
ParaGitV
52c6814e42 Expand Admin Investigate Logs for Cargo (#18491)
* Adds more investigate logging to cargo

Investigate verb for cargo lacks any logging for people who deny requests.

* Further expands cargo investigate logging

Adds logging for initial orders and cleans up the log format
2022-07-23 15:26:49 +01:00
FloFluoro
081221ac28 Fix Grape Granade allowing player to launch infinite items (#18492)
* Fix Grape Granade allowing player to throw infinite items

* Lower volume to 30
2022-07-23 15:26:29 +01:00
GDN
8c625c3bcc Removes the voodoo doll (#18500)
Doesn't even work + it has stun and GC issues

Part of stun removal project progression and AA's MTDC project
2022-07-23 15:26:17 +01:00
Charlie
59b72087f2 VV fix (#18511) 2022-07-23 11:49:23 +01:00
Charlie
ded049a902 Spell cooldown refactor (#18327)
* Squashed commit of the following:

commit 979fe5287c3dd33cd5d69bdd968beae245984f2e
Author: hal9000PR <charliesteeples@outlook.com>
Date:   Sat Jul 9 23:40:53 2022 +0100

    guts the old system

* refactors spell cooldowns into a handler

* charge datum

* garbage collection

* cleanup, renames cooldown var

* review changes

* boo cooldown fix

* styling

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-23 00:00:42 +02:00
FloFluoro
247f9712c5 Fixes grammar/punctuation on beverage descriptions (#18499) 2022-07-22 18:38:07 +01:00
Viz
c03cdf6140 Removes Mining Guardian from Necropolis Chests (#18482)
* i am not sorry miners

* you get nothing from me
2022-07-22 16:35:26 +01:00
Marm
85ce3fee2e Hello Peridol (#18476)
Removes probability for haloperidol to make the target drowsy.

Adds probabilily for haloperidol to make the target confused.

Adds probability for haloperidol to give the target blurred vision.
2022-07-22 16:35:02 +01:00
FloFluoro
ccafacd5b3 Changes Xenomorph instastuns to knockdown+stamina (#18450)
* Changes Xenomorph instastuns to knockdown+stamina

* Hunter pounce stam damage increased to 40
2022-07-22 16:34:10 +01:00
S34N
b27e2308c7 Refactors wiz teleport scroll (#18495)
* refactors wiz tele scrol;

* thingy

* spaces

* Update code/game/objects/items/weapons/scrolls.dm

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

* always true becom sometimes tru

* feedback

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-22 12:43:13 +01:00
FloFluoro
c610699c51 Changes vehicle lube stun to knockdown (#18486) 2022-07-22 11:17:04 +01:00
Bm0n
0e61f8f2ee adds gun counter for wt550 (#18487) 2022-07-22 11:16:48 +01:00
Viz
949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01:00
Contrabang
38f4445e26 Resprites areas, fixes areas covering more rooms than needed [MAP EDIT] (#18348)
* so much area

* oops forgot to remove unused sprites

* okay thats way better

* restores storage wing
2022-07-21 14:02:25 +01:00
KalevTait
780874a474 Code Readability - Living\Silicon (#18260)
* living\silicon

* toggled is also a bool
2022-07-21 14:02:16 +01:00
Luc
a48321fe96 Removes the 20 second stun from tourettes (#18463)
* Removes the 20 second stun from tourettes

* Update gene instability since it's cosmetic now

* Remove extraneous amountparalyzed check

* oops
2022-07-21 13:44:34 +01:00
moxian
51e5384299 Move clothing to /Initialize() (#18294)
* Move clothing to /Initialize()

* Farie review
2022-07-21 11:42:24 +02:00
Vi3trice
f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
AffectedArc07
20add76efb Refactors vote code (#18403)
* Vote refactor

* Tweaks

* Review tweaks

* Tweak
2022-07-20 22:13:41 +01:00
FloFluoro
444650ac7a Improved pizza bomb admin logging (#18466)
* Improved pizza bomb admin logging

* Adjust log message

* Nulls out refs on destruction
2022-07-20 22:12:41 +01:00
KalevTait
938135f3d8 modules misc (#18315) 2022-07-20 22:56:34 +02:00
Viz
234a471cf9 Removes instant stuns from defibs, adds knockdown and stamina damage (#18456)
* fuck this

* initial and probably bad attempt at handheld defib

* let us give this an actual use

* it was bothering me

* i am a goofball sometimes

* i forgor

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

* charlie review 2

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-20 21:47:39 +01:00
Charlie
02c5819fd4 Reworks Cults stun hand (#18247)
* cult stun hand rework

* FUCK

* Update debuffs.dm

* removes the alert

* Qwerties request

* steel review + new icon + to chat
2022-07-20 13:17:53 -05:00
Charlie
c41c2fba4a GC please (#18481) 2022-07-20 12:22:09 -05:00
Contrabang
8631dd8561 direction chairs are back baby (#18477) 2022-07-20 18:15:48 +01:00
Viz
7e472658ab worlds most inconsequential fix (#18478) 2022-07-20 18:15:35 +01:00
Sirryan2002
b6cc8e5644 fixes revenant being able to use machine verbs (#18365) 2022-07-20 18:06:52 +01:00
AffectedArc07
9cd7b2763b DMAPI Debug Verb (#18453)
* DMAPI Debug Verb

* This is needed for V3 support

* Clean this up

* pain

* Revert "pain"

This reverts commit 28c3588474.

* Cleanup

* Update code/modules/admin/verbs/debug_dmapi.dm
2022-07-20 18:05:47 +01:00
Nathan Winters
07219f941c Adds special click actions for Toggle Suit Sensors and Set Transfer Amount (#18431)
* Add AltClick action for setting container transfer amount

* Move jumpsuit accessory removal to AltShiftClick

* Add AltClick action for toggling jumpsuit sensors

* Fix toggling transfer amounts/suit sensors remotely/through windows

* HAS_TRAIR

* Revert the jumpsuit AltClick-AltShiftClick action swap

* Move adjacency checks into the main procs; fix whoopsie

* Update reagent container/jumpsuit examine messages

* Fix Set Transfer Amount verb catching items on the floor; spacing

* Refine guard clauses

* Use warning spans when mob moves away from item during dialog

* Add post-`input()` sanity checks

* Magic numbers begone
2022-07-20 18:05:33 +01:00
KalevTait
d028faf515 Stop slipping in closets (#18328)
* Stop slipping in boxes

* remove 'owner' safety checks

* !isturf instead of iscloset
2022-07-20 17:01:44 +01:00
FloFluoro
f0c13d0c4c Cocooned objects no longer emit light (#18464) 2022-07-20 16:21:17 +01:00
Charlie
636c5533eb camera exploit (#18472) 2022-07-20 13:12:24 +01:00
Viz
22c35b09be choked a skrell out for this one (#18432) 2022-07-20 08:32:27 +02:00
AffectedArc07
ef4d0667bb Optimises gas canisters (#18452)
* Optimises gas canisters

* Update code/modules/atmospherics/machinery/portable/canister.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-19 23:53:45 +01:00
Qwertytoforty
f2075c2e46 Fixes magic missile stun time, cult magic missile does knockdown (#18409)
* Moves artificer magic missile to knockdown, fixes magic missile stun time

* don't double down

* Move seconds to spell

* fix
2022-07-19 20:42:40 +01:00
PacifistDalek
dc4a5ca135 Adds a dodgeball in-hand sprite (#18322)
* inhand

* fix conflict
2022-07-19 14:42:14 -05:00
Qwertytoforty
ae335b55e2 Cult bolas now entrap the thrower if they are a non cultist (#18408)
* throw it back private

* Update code/game/gamemodes/cult/cult_items.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-19 20:41:36 +01:00
FloFluoro
8b4026e6aa Fix punctuation on deep fried food (#18446) 2022-07-19 20:41:04 +01:00
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
03564d05cf Fixes typo in plutonium core traitor objective (#18443) 2022-07-19 12:01:54 +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