Commit Graph

25237 Commits

Author SHA1 Message Date
1080pCat
eee723cd73 Adds mannitol and salbutamol to medical borgs hypospray (#20239)
* Update borghydro.dm

* Update code/modules/reagents/reagent_containers/borghydro.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-02-04 18:25:30 -06:00
Qwertytoforty
c28ab3e4da hierophant arena walls now decay after the hierophant dies (#20214)
* hierophant arena walls now decay after the hierophant dies

* changeturf

* Get pissed

* sriryan changes
2023-02-04 18:02:00 -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
warriorstar-orion
d32cbb7638 Fix varedited areas on Meta. (#20122)
* Fix varedited areas on Meta.

* inherited vars
2023-02-03 22:48:12 -06:00
Charlie
c5d7250c66 Projectiles now orbit blackholes (#19999)
* orbit

* I HATE ANGLES I HATE ANGLES I HATE ANGLES

* PERFORMANCE

* ready to merge
2023-02-03 22:36:06 -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
matttheficus
35476ab2c2 Allows the Kinetic Crusher to Parry Melee Attacks + BDM Trophy Tweaks (#20170)
* Parry this you filthy casual

* BDM offset
2023-01-31 22:07:12 -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
Vi3trice
caee0ec975 [TM] Verb Queue - Port of TG SSverb subsystem (#19863)
* Some verbs queue up now

* Damn you 515

* Screw you Topic

* Update client_procs.dm

* Fixes for unit testing

* Update MC.dm

* verb

* Update callback.dm

* Tweaks

* Linters might not have liked that,

* More tweaks, and fix

* Update verb_manager.dm
2023-01-29 15:05:38 +01:00
JimKil3
47f71ccde1 Fixes an issue with flashing (#20265)
* fixes it
Adds a check for the mob's eye status & moves checks above parent call

* i hate github

* coding chat advice

* unbuffs slimes
I had to rewrite the whole PR for this :(

* tweak + comments

* rewrites the PR again

* oops

* farie request

* aaa

* Apply suggestions from code review

Mostly whitespace & an implied thing

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

* another code review commit
Moves checks that stop eye damage but not flashing back

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-29 09:00:28 +01:00
Contrabang
22ea84d449 i love wallets i love wallets (#20308) 2023-01-28 20:12:19 +01:00
Farie82
6cf1580dc4 Stops the mother of terror from shitting out too much jelly (#20307) 2023-01-28 16:57:37 +00:00
Qwertytoforty
065b09fc1c Brains act more like dead humans on examine. (#20074)
* Brains act more like humans on examine.

* Apply suggestions from code review

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-28 09:36:34 +01:00
Qwertytoforty
3963f9b070 shadow demon / rev in spellbook (#20149)
* shadow demon / rev in spellbook

* tests code, icons

* Apply suggestions from code review

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-28 09:35:08 +01:00
Contrabang
a5250adea4 Security bots now consider wallets when arresting people (#20251)
* wowee

* fix a TON of runtimes
2023-01-28 09:27:20 +01: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
GDN
fdd51450fd portable camera GC improvements (#20287)
* portable camera GC improvements

* Oops didn't see this

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

* Better return structure

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-01-23 23:37:55 +01:00
Coolrune206
fbd4c9c98a this time it'll work, right guys? (#20213) 2023-01-23 23:37:46 +01:00
GDN
1b11867646 fixes a cyborg gc issue (#20283) 2023-01-23 23:29:01 +01:00
Qwertytoforty
4efeb71bf8 Fixes eyes of the gods bugs (#20266) 2023-01-23 23:28:46 +01:00
AffectedArc07
3d410a39f1 The most scuffed of optimisations (#20270) 2023-01-22 19:18:12 +00:00
GDN
a10641e07f aliens can be properly bola'd (#20137)
* xenos can be properly bola'd

* moved down to the carbon level

* shawn addition
2023-01-22 10:20:43 +01: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
GDN
50a73339b2 powered crossbow fixes (#20256) 2023-01-20 19:18:21 -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
817664b66b adds the cluwne goblin (#20244) 2023-01-20 19:11:34 -05:00
Contrabang
42a521dd50 mime greys begone (#20144) 2023-01-20 19:04:33 -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
7db4319aee fixes weakened issue (#20262) 2023-01-20 19:39:35 +00:00
GDN
5413955ce2 fixes a folded mask runtime (#20246)
* fixes a folded mask runtime

* snake case
2023-01-19 17:34:06 -05:00
Qwertytoforty
74a206d8b0 Goldgrubs can not block projectiles with 100% armor penetration (#20148)
* get your grubby hands off the cheese

* Update code/modules/mob/living/simple_animal/hostile/mining/goldgrub.dm

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-19 15:38:09 -05:00
S34N
c16481c076 removes smallhelath (#20237) 2023-01-19 15:36:27 -05:00
Adrer
3111e1f328 Assemblies containing an igniter do not prime grenade when used in hand (#20242)
* Assmblies containing an igniter do not prime grenade on attack_self

* Check if ignited in assembly in attack_self

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-01-19 15:35:17 -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
Qwertytoforty
c4bab6ff13 Plasma pistol no longer requires the user stand still while overloading it (#20146)
* Plasma pistol no longer requires the user stand still while charging it

* eh keep it 2.5 quite low dps

* Update code/modules/projectiles/guns/energy/special.dm

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-01-19 15:08:01 -05:00
Qwertytoforty
eae1af4c15 Body syndicate hardsuit sprites update properly (#20233) 2023-01-19 14:39:08 -05:00
warriorstar-orion
74c83582a4 Fix AI alarm camera selection locate scope. (#20243) 2023-01-19 13:05:13 -05:00
Contrabang
ee3720b151 Fixes countdowns being out of movement sync with their atom (#20219)
* countdowns move when their attached atom moves

* fallback
2023-01-19 12:52:25 -05:00
SteelSlayer
2840629fac free objective be gone (#20217) 2023-01-19 12:49:30 -05:00
Qwertytoforty
9805d61426 bsh no longer spawns invisible penguins (#20231) 2023-01-19 12:44:14 -05:00
McRamon
6085f3ccc6 changes (#20223) 2023-01-19 08:47:57 +00:00
Contrabang
276bf58f49 Wallets now show proper jobs on Sechuds and Comms (#20089)
* Wallet time

* sirryan review

* whoops

* revert get_id_card change

* Farie review
2023-01-18 21:52:09 -06:00
Qwertytoforty
cc1de516ad Emagging a pacman does something once again. (#20179)
* I hate tgui

* sirryan changes

* tgui.png
2023-01-18 22:37:16 -05: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
Coolrune206
bf4212d24a Soap stops swearing (#20162)
* technically functional

* technically functional

* more logically coded, credit to Contra and Mira

* yes this is more logical

* Sean and Fox reviews

* webeditor heresy
2023-01-18 11:32:28 -05:00