Commit Graph

3774 Commits

Author SHA1 Message Date
Luc
9ba005de9f Add themselves as a pronoun helper, fixes some usages of it (#20184)
* Add themselves helper

* Testing and replacing

* Fixes some non-standard usages
2023-01-20 19:28:48 -05:00
Qwertytoforty
aec7c3ff3f Reworking eyes of god to be risk / reward / from colossus (#20163)
* eye see what is happening here

* loot it and ship it

* more progress

* more progress

* eye see

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

* Apply suggestions from code review

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

* removing extra comment to rerun checks while I think on sprite

* name / sprite, good to go™️

* BSH no longer spawns invisible penguins

* oops wrong branch

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:28:22 -05:00
Luc
b940c1eb21 Allows clings to regenerate without a brain. (#19856)
* Move brain organ code where it belongs

* Rename too

* WIP, but hey, it kinda works now.

* Account for a few missing heads

* Remove vital check, killing the user on death

* Let defibs and scanners better deal with these

* Remove debug brains

* Clean up some more contingencies

* More head checks

* Update code/modules/antagonists/changeling/datum_changeling.dm

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

* Fixes up signal business

* some stuff from sean's review

* Add some type safety checks for heads

* oops

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

get this in there too

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Remove decap sword

* Quick suggestions

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

* Addresses shedding problems

* Add new defib changes

* this is why we have CI

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:25:51 -05:00
SteelSlayer
29ee05fb8f parry CD fix (#20259) 2023-01-20 19:20:01 -05:00
Henri215
9a0ceb5a03 Janiborg no longer starts with floor buffer and now can be toggled (#20133)
* Cyborg upgrade floor buffer and toggle mode

* Update code/game/objects/items/robot/robot_upgrades.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Apply suggestions from code review

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-20 19:16:34 -05:00
Vi3trice
07a7caff1f Polishes the Shadow Demon (#20245)
* For the basement dwellers out there

* Update bloodcrawl.dm

* Update bloodcrawl.dm

* Update bloodcrawl.dm
2023-01-20 19:12:16 -05:00
GDN
208c110b77 fixes the billion of disease runtimes that show up on the production log (#20247) 2023-01-20 18:20:36 -05:00
Qwertytoforty
de313cf3a5 Legion cores no longer fix bones / ib on station, unless implanted. (#20176)
* legion cores no longer fix bones / ib on station.

* Apply suggestions from code review

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-19 15:40:13 -05:00
matttheficus
9d199a8f64 Limits Telegun to Current Z-Level (Unless a Beacon is Emagged) (#20097)
* Update telegun.dm

* i am bad at logic I got a 72% in the class

* im bad two electric boogaloo

* Caps Moment

* Update telegun.dm

* I cant code, this finally worked

* TC update

* Update special.dm

* it works, yipee

* Sirryan review

* safety is good

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-01-19 15:10:13 -05:00
Octus
ea7bff0779 not gonna sugar coat it (#20155) 2023-01-18 21:45:22 -06:00
AffectedArc07
946fb4dff6 Small MC refactor (#20017)
* Small MC refactor

* Order fix

* Nabs tgstation/tgstation#27324

* Oops

* gnarg
2023-01-18 12:06:24 -06:00
GDN
156f0e69cf Tones down rathens (#20165) 2023-01-18 11:37:16 -05:00
GDN
bd1e5e5142 The drop hotkey is now consistent with the drop verb (#20192) 2023-01-17 00:17:06 -06:00
Luc
8b91d8b48e Refactors defib code into a component (#19987)
* Start to datumize the defib.

* Wire everything else up

* connect some loose wires from testing

* More changes from testing

* More cleanups and documentation

* Revert CMO defib to have a 10% heart-attack chance

* Review, clean up giant if statement

* other review things

* sirryan review

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

* change signals to direct proc calls

* rename variable

* Fix bad argument

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-16 20:19:03 -06:00
Eric6426-Blossom
190313723b Fixes changelings and legion cores allowing for revival within Slaughter and Laughter demons (#20166)
* DemonFix?

* FaerieReview

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

* Fixpart2

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

* safetyqdel

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-16 21:53:50 +01:00
SteelSlayer
25868fd64e Parry-capable shields/weapons list which attack types they're able to parry when examined (#20171)
* parry examine text

* I forgot the signal handler

* use defines instead
2023-01-15 23:06:57 +00:00
S34N
f9952db04e Fixed incorrect scope for some simple animal emote keybinds (#19994)
* fixed this

* misclick
2023-01-09 13:11:13 +01:00
Henri215
e711cd5921 Fixes lots of common spelling mistakes (#20086)
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
2023-01-08 20:12:31 -05:00
Luc
04c0704302 Ensures mobtypes are checked before verifying surgery can start (#20081) 2023-01-07 19:55:41 +00:00
Qwertytoforty
7fb017915f Makes cling tentacle more reliable / less shit (#19855)
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

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

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-06 21:31:37 +01:00
S34N
d1e30b9854 Revert "Prevents limb regeneration when changing species (#19945)" (#20102)
This reverts commit 4b255c16e4.
2023-01-06 21:23:09 +01:00
Luc
4b255c16e4 Prevents limb regeneration when changing species (#19945)
* Prevents clings from quick regenerating bodyparts

* Clarify a comment

* Reworks to work with monkeys and other sources as well

* qdel organ if it doesn't get inserted

* Use initial instead of creating and qdeling

* Revert unnecessary cast
2023-01-05 11:52:34 -06:00
Bm0n
6491512cbd You can now put items into bags, belts and the suit slot using hotkeys. (#19957)
* you have committed cringe, now die

* proc>verb

* shit

* dufflebugfix

* mob/living/carbon/human/proc/quick_equip_bag(

* hal review

* drawdie

* typo

* siiryan review

* now with less runtimes

* oh you piece of shit

* reformatted

* hal
2023-01-04 22:21:46 +00:00
Qwertytoforty
cfc31154e7 Wizard forcewall now has a 15 second cooldown vs 10 second (#20052)
* Wizard forcewall now has a 15 second cooldown vs 10 second

* Apply suggestions from code review

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2023-01-04 17:17:35 -05:00
AffectedArc07
1feb9fbd38 [READY] Atmos Refactor Part 7 (I think) - Kills signals + TGUIs stuff (#19867)
* I AM NOT A KING. I AM NOT A GOD. I AM LUNACY.

* THE SCOPE CREEP

* This was done in vi. No langserver. Send help.

* Progress

* Some issues fixed

* The code builds, but the maps dont

* CC builds, I doubt anything else does

* Do this now

* Safety

* The map compiles

* THE MAPPING HELL

* Airlock controllers dont work

* Fixed bombs

* AND THATS FIXED

* Phantom edit

* Restores LL I think

* The mapmerge hooks are actually retarded

* Fixes spawners

* Half working air control

* Picky

* Hyper efficient tank monitor

* Sanity

* Laying the framework

* Improved alert console

* Dont think this is actually done anywhere

* Metering

* ONE HUNDRED AND ~~EIGHTY~~ TWENTY SEVEN

* WE ARE READY FOR BOX TO BUILD

* One map done

* Well that was easy

* Another one

* I think this is done

* I should have removed this

* I would make a russian joke but <current event>

* Delta WIP

* Makes delta work

* Early review

* TM safeguard

* oops

* METAAAAAAAAAAAAAAAAAAAAAAAAA

* Fix #4213

* Trailing

* oh for piss sake

* Shutter fix

* Roundstart ATs can go away

* Review pass 1

* What could go wrong

* BOOM BOOM BOOM

* Not needed

* Fix seed vault

* Oops

* Review changes
2023-01-03 20:59:35 +00:00
Contrabang
fb3e773b0a Improves the Medical Record Terminal (#19828)
* better medical records

* comment

* sirryan review, remove sorting on nulls

* bundle fix

* removes generalized sortbutton

* I dislike copying
But I couldn't find a better method.

* forgot to remove this bit

* fix bundle

* sorting works again, name overhaul

* removes the research scanner from borgs

* Revert "removes the research scanner from borgs"

This reverts commit fbf73cdfad.
2023-01-01 11:36:32 +00:00
Contrabang
b013639cf5 Buffs arm implants (#19773)
* fuck it signal time

* heres a great example of simplifcation!

* fuck it sometimes you have to ball, fuck stoplag

* fuck yeah baby, mob signals instead

* bam good code

* add support for drop button

* lets not drop nulls

* sirryan review
2022-12-29 17:49:31 +00:00
Charlie
8ef4aa727e Adds Shadow demons (#19732)
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 11:26:37 -06:00
BiancaWilkson
ce5f8059b3 Buffs and cleans up atomic panacea (#19904)
* panacea uses invoke async

* Update code/modules/antagonists/changeling/powers/panacea.dm

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

* its a status effect now

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-29 16:31:12 +01:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006)
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
2022-12-29 14:28:40 +00:00
warriorstar-orion
066bd06e8d Whitespace cleanup part 3. (#19897)
* Whitespace cleanup part 3.

* clean up mecha a lot, other review fixes
2022-12-27 11:00:39 -05:00
Qwertytoforty
f86374a504 Adds the vortex feedback inversion arm. (#19821)
* start of mess

* reflect/parries works

* more pog-ress

* temp icons, .33 to 0.4

* more work, sound, rnd, fixes me breaking shields

* removes this since open pr fixes

* better codee

* attack log

* Final changes / sprites by ramon

* fixes issue

* shoot ramon for the white pixel :^)

* But what if it was a purple glass shard

* Fixes the throw parry

* sorry for so many commits, lower callback

* Apply suggestions from code review

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

* Early return, no need to typecast

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-12-27 10:45:59 -05:00
GDN
07a84dd5c8 Minorly refactors the "gripper" cyborg item and moves the "drop gripped item" to an action button (#19990)
* moves the "Drop item" verb and minorly refactors grippers

* converted to an action button + ryan's review
2022-12-24 12:48:42 -05:00
Bm0n
4bb0eb822d Ports TG ID cards (#19807)
* new ids!

* tcomms fix for ERT

* as above

* star for ERT commander

* Syndie commander ID gets a star instead of crown

* fixed TDred ID card

* cmag tweak

* pda id overlay

* whoops i fucked up shaftminer

* first pass

* jobs_centcom

* SHHHHH

* WHY DO YOU HAVE GLOVES?
2022-12-24 18:15:49 +01:00
Qwertytoforty
a88828ff47 Ports spacetime distortion spell from TG (#19658)
* NanoMap Auto-Update (Wed Sep 23 20:02:25 UTC 2020)

* Deconflicts

* Revert "Deconflicts"

This reverts commit a52c425136.

* Update filingcabinet.dm (#14616)

* updates haloperidol and nanocalcium to take less effort to modify. (#14612)

* Rename all instances of "virgin" being used as a variable name to more appropriate and self-explanatory variable name

* Oops

* Update filter.dm

* lore fix (#14627)

* breaks spacetime and or smoothing

* spelling, range upgrade for more points

* actually fixes it

* sprite via ramon

* 20 -> 15

* Apply suggestions from code review

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

* removes element

* sigh

* god I love icon conflicts

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* henks requests

* Update code/datums/spells/spacetime_dist.dm

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

* Henks changes

* Update code/datums/spell.dm

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

Co-authored-by: NanoMap Generation <action@github.com>
Co-authored-by: Qwertytoforty <qwertytoforty@gmail.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: Aquilar <20759278+Aquilar@users.noreply.github.com>
Co-authored-by: variableundefined <40092670+variableundefined@users.noreply.github.com>
Co-authored-by: SteelSlayer <alexgcopeland123@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-12-24 18:11:23 +01:00
Coolrune206
5b7d0a9fa3 Re-adds Rathen's Secret to the Spellbook (#19913)
* Re-adds Rathen's Secret to the Spellbook

* grammar
2022-12-24 10:58:21 -05:00
Bm0n
2ca533cbdf Crawling sounds (#19902)
* ports crawlingsound

* hal review

* as above

* fixes people with no legs making no crawling sound
2022-12-19 23:44:07 +00:00
warriorstar-orion
77f576a5ca Recategorize in-game announcements by priority. (#19639) 2022-12-19 17:02:22 +00:00
ElorgRHG
638e49001f Handholes alternative solution, less issues version™ (#19724)
* Alternate solution to handholes

* Markings handling

* Respecting missing hands

* Fixes handholes for ID photos/records, removes gloves from images in them for code simplification and consistency sake

* hand not hands
2022-12-17 17:09:32 +00:00
SteelSlayer
932ddc861a give admin-granted traitors their objectives and uplink automatically (#19859) 2022-12-13 16:48:17 +00:00
Coolrune206
9bca5ac7b2 Prevents eternal Rod Form (#19881)
* makes rod form not work while jaunting

* Revert "makes rod form not work while jaunting"

This reverts commit fb1be0f482.

* prevents eternal rod form

* hal9000 review
2022-12-11 15:16:28 -06:00
Farie82
1ba7e14fc2 Adds Blob burst status effect to both blob mice and humans (#19678)
* Add blob burst status effect to mouse and human

* Mouse cleanup

* Blob code refactors

* Change description

* Undo testing changes

* fix final stage

* Better map text. Thanks to Vi3trice

* Update code/datums/status_effects/blob_burst.dm

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>

* Update code/game/gamemodes/blob/blob.dm

* Duration fix + potential GC fix

* Update code/game/gamemodes/blob/blob.dm

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

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-11-26 15:41:48 +00:00
Luc
1490f60819 Adds new emote keybinds, and emote keybind unit tests (#19603)
* Adds a keybinding for *crack

* Add new unit tests

* Fix up unit tests

* oops, this wasn't supposed to make it in

* Update code/modules/unit_tests/emotes.dm

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-11-25 23:01:31 -06:00
SteelSlayer
cde6fd1520 Refactors objective code to account for there being multiple owners (team objectives) (#19289)
* refactors objectives to account for multiple owners

* sean review

* fixes all steal objectives becoming free objectives

* another one

* fix escape objective order of operations

* charlie review
2022-11-25 18:11:53 +00:00
AzuleUtama
bfdeb87aed Merged forcewall and greater forcewall into a single spell (#19739) 2022-11-24 22:52:24 +01:00
Vi3trice
d3d8895d48 Respect mouse (#19758) 2022-11-23 12:51:11 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209)
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

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

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-11-21 23:30:50 +00:00
Henri215
a7864e6e9a Clown FIX: Adds the clown recorder (#19710)
* Adds the clown recorder

* added item action

* Defining cooldown

* cmag define

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

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

* added a second laugh

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-11-20 23:13:52 +01:00
Coolrune206
cbdbf60f57 Makes the pet collar not an accessory. Remake remake of the revert of the revert. (#19644)
* let's try this again

* who even named these variables

* Sirryan review

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

* removes as mob

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-11-17 17:31:51 +00:00
S34N
9d27ebea75 ensures map templates don't kill server (#19690) 2022-11-16 21:14:13 +01:00