Commit Graph

9998 Commits

Author SHA1 Message Date
Vi3trice
a5d949a0e7 Why (#20514) 2023-03-04 15:29:33 +00:00
1080pCat
6b4feef831 Removes the RCD from engi borgs base kit, and replaces it with a module upgrade (#20449)
* be moved rcd!

* Minor grammar change ~contrabang

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>

* ert/emag borg get rcd & fixes issue GDN brought up

* Fixes an oversight with getting more than one rcd

Co-Authored-By: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Remove space from rcd upgrade name

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-04 09:56:21 +01:00
S34N
9b260c4611 adds wire interface implant (#20482) 2023-03-04 09:56:06 +01:00
Henri215
77b554b73e Deluxe soap for ERT (#20346)
* Elite soap for the best

* Reverting janiborg soap
2023-03-04 09:39:18 +01:00
Adrer
732914dda7 Refactors revolution code to be a little less of a mess (#20327)
* Refactors revolution code

* Ad comment to transit_z

* Add heads check to transit_z

* Rename parameter in transit_z

* Fix duplicate definition of latespawn

* Remove unused check_counter var

* Apply suggestions from code review from Sirryan2002

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

* Added early return to conversion proc

* Apply suggestions from code review

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

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-04 09:22:23 +01:00
Christasmurf
330180c83e Dignitary drip - Magistrate, NT Rep, Blueshield (#20438)
* dignitary, human, items, spawning

* garment bag update

* dignitary icons

* ntrep cap

* gloves and hat fix

* dignitary icons part 2 and misc code

* minor stuff

* hat fix from updates also drask and grey suit slot

* minor description discrepancy

* cane resprite
2023-03-02 09:15:35 +00:00
Luc
90fbfb8d0c Fix shock sounds (#20457) 2023-02-27 11:01:32 -06:00
Henri215
e081a9976a Adds five new bible sprites (#20416)
* Fours new bibles and lib computer emag_act

* inhand sprites and moving bibles to new dmi file

* Clockwork bible

* Missing pixel from clock_bible
2023-02-27 10:52:07 -06:00
GDN
8eccdfcb19 fixes a highlander runtime and the highland MA not being assigned (#20409) 2023-02-27 10:34:13 -06:00
Henri215
1ce593b9a2 Ports TG push broom (#20367)
* Ports TG push broom

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

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

* Apply suggestions from code review

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

* Lewc review and twohanded autodoc

* Steelslayer review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 12:15:21 -06:00
HMBGERDO
e491aa9c2e Fiber Garrote now mutes all emotes when garroting target (#20393)
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent

* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"

This reverts commit bc093ba01f.

* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds

* comments update, status set function standartisation

* Update code/datums/emote.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 01:12:56 -06:00
Henri215
397552b09e Fixes some plaques descriptions (#20387)
* Fixes some plaques descriptions

* S43N review and violence free plaque desc
2023-02-25 00:51:28 -06:00
Henri215
f0bf051e4b Janitorial holosign projector tweaks (#20368) 2023-02-25 00:14:19 -06:00
BiancaWilkson
ceed4e89f9 Reworks the poison pen (#20353)
* paperwork so boring it kills you

* it's worth a bit more now

* Backup in case you poison yourself

* Virologist gets it, accurate description

* I promise im literate

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* No more charcoal, time for gloves

* Turns comments into auto-doc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-02-25 00:08:40 -06:00
Luc
bcc6b4c24a Putting nerds to bed (#20436)
* and here's the sleeper

* Client-less animals sleep for longer

* Fixes sleep length

* never mind, animals can't be pushed :(

* pronounce

* Ensure they aren't already sleeping

* 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>
2023-02-21 22:16:05 +00:00
Coolrune206
5a94bb7551 yeah, no (#20424) 2023-02-17 22:35:07 +00:00
1080pCat
c75f5d1f6c Changes the fluffy cuffs description to not mention keeping your SO in line.. (#20428)
* goofy ah

* minor spelling error :(
2023-02-17 22:33:54 +00:00
1080pCat
b8c12bbbf7 more medborg love (#20332) 2023-02-16 21:06:23 +01:00
Samman166
f915a1d614 Removes smoke cluster grenades (#20331)
* Removes smoke cluster grenades

* removes regular hellwater grenades
2023-02-15 21:17:35 +01:00
GDN
f567da369b deletes the forcesay() proc fixing tyder wizards getting murderized (#20398)
* deletes forcesay

* removes hit_appends fully
2023-02-15 20:55:50 +01:00
Coolrune206
acb04f2a73 fixes ghost locker exploit (#20427) 2023-02-14 21:18:46 +01:00
GDN
6091027265 adds bananium meteors (#20325) 2023-02-14 20:53:30 +01:00
Vi3trice
f428cee612 Adds the cash register (#20138)
* You asked

* Tweaks

* Update eftpos.dm

* Adding registers

* good luck meta you'll need it

* Update eftpos.dm

* More sounds

* More sounds, you can pay as long as you're close to the register.

* Tone down the edits, chefs will figure it out

* tim allen grunt

* Update eftpos.dm

* Update eftpos.dm

* Update code/modules/economy/economy_machinery/eftpos.dm

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

* Ceres is a thing now

* Fix merge

* Update eftpos.dm

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-14 10:14:10 +00:00
warriorstar-orion
a7bd9d6bde Whitespace fixes, final part (hopefully) (#20361) 2023-02-13 11:49:28 -06:00
GDN
aa56d75f93 [Ready for code review] Moves alien verbs to spells (#20002)
* Moves alien verbs to spells

* lol

* Standardization, polish, making alien plasma huds more consistant

* The very cursed way of handling touch spells

* logging + more polish

* snakecase + documentation

* finishing touches

* oops, ty henri

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* sprites from TGstation

* sprites, again

* oops

* farie's review part 1

* farie's review p2, signals

* Erics PR compat

* farie's review 3

* that too

* the shawnshank redemption

* boink

* removes larva transfer plasma

* you want a sprite cranberry?

* TM fix 1

* FUCK I BROKE LOGGING

* bam

* final touches

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-02-12 21:34:11 +01:00
Henri215
42d1758b2e Fixing common spelling mistakes part 2 (#20360)
* Fixing common spelling mistakes part 2

* "supressed"
2023-02-08 21:20:35 +01:00
Qwertytoforty
e40ef20c86 Pizza bombs can no longer be told apart, some pizza improvements (#20191)
* pizza time

* a batch of delicous pizza fixes mama mia

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

* bool

* Apply suggestions from code review

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

* steels changes

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-02-08 13:07:36 -06:00
Octus
fba3664c5a rubbah (#20339) 2023-02-06 16:04:39 +00:00
Contrabang
ce59b7b712 Adds a searchbar to the Traitor uplink (#20230)
* searching traitor uplink

* remove unused variable

* sirryan review
2023-02-04 19:22:56 -06:00
Adrer
64888c1fa6 Acting heads now can access their department accounts (#20288)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-02-04 18:31:29 -06:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195)
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
2023-02-04 16:33:41 -06:00
Henri215
c4667311e7 Janitorial equipment tweaks and cleaners availability (#20037)
* Janitorial equipment tweaks and advanced cleaner

* cleaner availability tweaks

* old cleaner for drones

* Mop capacity buff

* advanced cleaner for sol traders

* conflict part 1

* Merge branch 'master' into janitorial_tweaks

* Revert "Merge branch 'master' into janitorial_tweaks"

This reverts commit 47129ea819.

* Revert "Revert "Merge branch 'master' into janitorial_tweaks""

This reverts commit a8c520b069.

* hahahahaha

* hahaha part 2

* hahaha part 3

* cerestation edit

* adv cleaner comes with 500 now and ERT belt

* lube spray upper case and moving it to spray.dm
2023-02-03 13:10:51 -06:00
Ryan
7c3cd86f14 APC & Machinery Refactor + Local Powernets (#19991)
* local powernet and machine power refactor

* some fixes

* more tweaks + powerchange() refactor

* fixes var edited apcs on meatpackers.dmm

* fixes issue with power channels

* Reviews

* delta fix

* Update code/game/machinery/portable_turret.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

* removed area power change proc

* damn morgues

* requested changes

* request changes

* deconfliction

* mapping fixes

* some fixes from TM

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-01-30 22:28:10 +00:00
Qwertytoforty
b5700cab3e Fixes rng block chance not working (#20255)
* fixes rng block chance not working

* Update code/__DEFINES/flags.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-28 09:26:11 +01:00
Contrabang
7afa6cb087 Wallets and ID card tweaks (#20250)
* wallet the third

* MORE id card tweaks

* farie review
2023-01-25 20:13:38 +01:00
Adrer
8aaf8a8ab8 You can no longer push people into fireaxe cabinets. (#20279)
* You can no longer push people into fireaxe cabinets

* Or statues and critter crates

* Or crates

* Remove duplicate shove_impact

* Silly newline

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-01-23 23:08:16 +01:00
GDN
29b889a58f implanter's implants gc fix (#20271) 2023-01-23 12:23:12 -05:00
Adrer
524a8dc0b4 Makes you unable to pull a surgical tray you are standing on (#20229)
* No longer pull trays you are on.

* Update code/game/objects/structures/tables_racks.dm

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

* Update code/game/objects/structures/tables_racks.dm

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

* Remove unnecessary loop from can_be_pulled

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-21 14:13:06 -05:00
warriorstar-orion
b790e6d5e2 Whitespace cleanup part 4. (#20226) 2023-01-20 19:40:42 -05:00
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
Qwertytoforty
b90bb7bcb8 ERT / nukies can now choose any NON KARMA species (#20032)
* ERT / nukies can now chose any NON KARMA species

* hahah yeah better fix that from testing

* warning people about implant destruction

* spritare

* random species option

* Apply suggestions from code review

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>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-01-20 19:22:29 -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
GDN
311cdae455 Converts some borg equipment to radial menus (#20044)
* Borg stuff radial menus; I hate borg hypos

* sneaky

* borghypo can be it's own thing

* forgot ya

* ryan's review
2023-01-20 18:59:35 -05:00
Qwertytoforty
8a3170b7b4 fixes flashbang cheese (#20254) 2023-01-19 22:28:23 +00:00
Eric6426-Blossom
64d74ed0f7 Xeno Door Balancing + Tiny fixes (#20154)
* XenoDoorBalancingTweaks

* Doesn'tbreaknow

* AutoDoc

* Vi3t review

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

* ConflictFix

Co-authored-by: Vi3trice <80771500+Vi3trice@users.noreply.github.com>
2023-01-19 14:52:21 -05:00
Luc
a45f33c313 Shoving nerds into lockers (#20160)
* Adds locker shove impacts

* Feedback

* we do a little testing

* fuck
2023-01-19 14:48:14 -05:00
Henri215
671e75abe6 Fixes janicart and mop bucket overlays not updating properly (#20232)
* Fixes janicart and mop bucket overlays not updating properly

* Sirryan review

* ops
2023-01-19 14:23:21 -05:00
matttheficus
ca748ba341 let them READ (#20241) 2023-01-19 12:45:01 -05:00