Commit Graph

42910 Commits

Author SHA1 Message Date
Adrer
f806aed945 Scrubber/pump eject into hand (#23283)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-24 15:36:40 +00:00
HMBGERDO
53f6b905e6 customised_abstract_text - removed useless check, changed var (#23282)
* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
2023-11-24 15:36:24 +00:00
Aylong
c1900f2d4f [TGUI] Input List (#23281)
* TGUI Input List

* Formatting

* TGUI re-build

* Holopad & Drop Bomb

* Update tgui.bundle.js

* if

* linter

* Mistake

* TGUI input - Barsign

* Review changes
2023-11-24 15:36:04 +00:00
1080pCat
a854dab973 engi ert buff+little ert buff (#23270) 2023-11-24 15:35:41 +00:00
GDN
11dc93d501 fixes being unable to rename paper (#23269)
* fixes being unable to rename paper

* Update code/modules/paperwork/paper.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:35:04 +00:00
Adrer
d1374cc1be Check if mob is still horizontal after starting to crawl under airlock (#23261)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-11-24 15:34:43 +00:00
1080pCat
bc7356b578 The temperature gun no longer self charges. (#23260)
* Update special_eguns.dm

* HENRI review, also forgot the to_chat change

* Update special_eguns.dm
2023-11-24 15:34:25 +00:00
Cocacolagua
4b3a720d96 Removes boxes from the uplink PART 1 (#23189)
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure2

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* yeahsure3

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* ok no more kit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-24 15:33:25 +00:00
Luc
9f9db15c8b Defibs now shock people giving CPR (#23257)
* defibs now shock people giving CPR

* use isnull instead

* humanoid like me
2023-11-24 15:33:01 +00:00
Luc
0b4a2bb5cf Adds LOOC to runechat. (#23256)
* adds looc to runechat

* remove hearers

* remove unnecessary parens

* Prevent observers from LOOCing runechat

* Update code/game/verbs/ooc.dm

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

* contra review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:32:31 +00:00
DGamerL
429981e797 Nerfs baton throwing (#23241)
* Ezpz

* Removes unnecessary text

* Adds the sound back

* Baton now stuns the hit person

* Present tense
2023-11-24 15:32:07 +00:00
Adrer
cda62a5bb3 Reflectors now return materials on deconstruction (#23215)
* Reflectors now return materials on deconstruction

* Fix some weird formatting

* Snake case

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-24 15:31:48 +00:00
Daniel Lenrd
4a3437355e HUDs can now only change status with sufficient ID access (#23086)
* Added mental to MedHUD

* Made HUDs write based on ID access

* Makes Chamelion secHUD have write access

* adds trailing newline in defines

* med examine spacing adjustment

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* sec examine spacing adjustment

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* 0 and 1s

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

* removes the sec_hud_set call, probably a bad idea

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-24 15:29:59 +00:00
DGamerL
7181d869d7 Buffs His Grace (#23040)
* This should be most of it

* I forgor to push this

* Makes this look better too

* Slight last things

* This has to be 0

* Fixes everything being broken all at once

* Fixes ascension eating the owner

* Extra insurance

* Removes debug messages

* The most minor of optimalizations

* Sirryan review

* Cleaning up the files

* Update code/game/objects/items/his_grace.dm

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

* Removes unneeded variables + Lewc review

* Ternary my beloved

* Checks the correct thing

* Less bloodthirst per second and back to 25 victims

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-24 15:29:13 +00:00
Contrabang
13432a296f we love code that compiles (#23340) 2023-11-22 19:22:29 -06:00
Adrer
a92428e175 Adds PAI to cargo shuttle blacklist (#23284)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-22 11:13:48 +01:00
GDN
637373cafb fixes some issues with defibs (#23276) 2023-11-22 11:09:58 +01:00
Adrer
a169176829 Make dicebag not a pillbottle subtype. (#23121)
* Make dicebag not a pillbottle

* Fix all other references

* Map update

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-11-21 23:09:03 +00:00
Venuska1117
325cd3abf4 fix that unisex restroom on box (#23072) 2023-11-21 23:08:44 +00:00
Qwertytoforty
207e35cddf Adds 3 ipc only implants. (#22798)
* FUCK fix drugs first

* done just wait for prs to be merged (sorry s34n)

* removes uneeded chest implant redifine, repair implant

* Apply suggestions from code review

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

* !human, fluid

* guard variable lisst

* oops

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/stacks/nanopaste.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

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

* lewcs good to them?

* Apply suggestions from code review

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

* not needed

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-21 16:19:39 -05:00
DGamerL
7e74694d6e Fixes some issues with patches and pills (#23322)
* Oops

* Update code/modules/mob/living/carbon/carbon.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-21 13:49:20 -06:00
DGamerL
307120e7d3 Patches and pills are now no longer subtypes of food (#23063)
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

* Update code/modules/mob/living/carbon/carbon.dm

* Update code/modules/mob/living/carbon/carbon.dm

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

* Update code/modules/mob/living/carbon/carbon.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/modules/mob/living/carbon/carbon.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-11-21 15:37:16 +00:00
Octus
ba44b18102 Removes Barber because its a poorly designed role (#23053)
* solong

* test

* update

* fixififixx

* ok back to barbers

* spring cleaning

* i hate you safety scissors, genuinely

* space fix

* reviews

* Update sechud.dmi

* Update card.dmi
2023-11-21 13:10:13 +00:00
Luc
8546a2ca1f fixes acid peels (#23298) 2023-11-21 13:04:01 +00:00
Luc
9384c2a074 Allows roundstart observers to freely use antag HUD without losing respawnability (#23009)
* First pass

* do away with old antag hud variable

* rework cannotPossess

* some verification + cleanups

* Update code/modules/mob/dead/observer/observer_base.dm

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

* splits up log call

* Slightly refactor proc calls, continuing contra's review

* Log admin

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-21 13:00:13 +00:00
Vi3trice
f70b534aee Tweaks Load Lawset to differentiate between admins and normal players, admins can choose to not change zeroth laws (#22842)
* Naughty borgs

* I'm warning you

* typo

* Update law_manager.dm
2023-11-21 12:59:45 +00:00
S34N
547ce531a7 Cyberiad Bridge remap (#23015)
* initial

* final changes

* edits

* PDA, errors. etc.

* further tweaks

* do a flip

* glass APC

* shuffle continues

* move AI upload to sci, restore old shop and explorer room

* pipes!

* statue fix

* warrior fixes

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

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

* denth request, merge conflict fixes

* area shuffle

* wall furniture my beloathed

* fixes teleporter, fixes ventless AI upload

* minor fixes

* more tweaks

* Update code/game/area/ss13_areas/engineering_areas.dm

* more fixes

* grav gen shuffle

* messaging server APC move

* move AI upload again, fixes

* further tweaks

* minor tweaks

* minor fixes

* nukes supply sop

* git-gor fixes

* disposal fixes

* cable fix

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-20 15:49:36 -05:00
GDN
4789f00090 makes paper stack burning more consistent (#22849)
* makes paper stack burning more consistent

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* reviews

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-20 14:26:45 -05:00
GDN
38f765d4dc Gives drones respawnability, improves killing yourself as a drone (#23070) 2023-11-20 14:12:15 -05:00
GDN
eb371c441c makes ancient goliaths only make tendrils if they have a target (#23151) 2023-11-20 14:10:56 -05:00
Adrer
39005bea2b Fixes machine using power from the area it was created in, rather than using the area it is in (#23188)
* Update machine area when power_change() is called.

* Do not attempt to unregister from null powernet

* Move to wrench and update wrench_acts

* Remove accidental pseudocode

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-20 14:10:23 -05:00
ppi13
5ac1cc817d Fixes a runtime in mind traits and makes IS_HOLY work versus vampires (#23200)
* Fixes mind trait runtime

* DGamerL suggested changes

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Contrabang  suggested changes

* Contra suggestions and improvements

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-20 14:10:04 -05:00
DGamerL
be1f2d9e54 The fix (#23290) 2023-11-16 20:08:49 -05:00
matttheficus
7f02b6859d Contractees Now Lose All Implants + 10 Minute Time if Antagonist (#22856)
* i love chaos

* contra review

* contra review 2 or something

* comment fix
2023-11-15 20:40:05 -05:00
Marm
91ef8186a2 Further changeling engoodening: chameleon skin buff. (#23233)
* engoodening

* oops

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

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

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

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

* fingy print

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

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

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

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

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

* contra review.

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2023-11-15 19:15:28 +00:00
DGamerL
fef021690e Fixes a few runtimes (#23264)
* The fixes

* This probably has a worse underlying cause

* Update code/modules/paperwork/paper.dm

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

* Cotnra review

* Contra review

* Removes nullcheck

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-15 12:01:55 -05:00
Adrer
0bf67f14a7 [s] Fix teleporter recursion (#23265)
* Prevent teleporting onto a tile with a teleporter

* True and false

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2023-11-14 19:32:51 -05:00
Tom Heeren
5e7e0f348b removes the 'is' from the set-pose command (#23190)
* removes the 'is' from the set-pose command

* Update code/modules/mob/living/carbon/human/human_mob.dm

This commit mandates Lewcc to complete dark chasm with cresselia and the worst starter characters

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-14 13:39:51 +00:00
Stone
26ef96358b Shadow Demon Sound Rework (#23052)
* Adds custom sounds to majority of the shadow demon.
Death sound, grapple sound, cocooning sound, attacking sounds and
hallucination sounds

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

* Update code/game/gamemodes/miniantags/demons/shadow_demon/shadow_demon.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-11-14 13:20:00 +00:00
Deniz
674ca2fb69 reviews (#22806) 2023-11-14 13:18:01 +00:00
Сиротка
fb2a51da53 Reason text for sentience potion (#23139)
* Reason text for sentience potion

* Update code/controllers/subsystem/SSghost_spawns.dm

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

* Update code/modules/research/xenobiology/xenobiology.dm

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

* Update code/controllers/subsystem/SSghost_spawns.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-11-14 13:16:30 +00:00
dj-34
25c3980998 Fix item state of flashlights & cult mirror shield (#23211)
* Fix item state of flashlights & cult mirror shield

* update by request
2023-11-14 13:13:10 +00:00
Arthri
230cfe4226 Ports Firing Range Magnet Control to TGUI (#23066)
* Add magnet controller

* Introduce constants

* Implement linking menu

* Make path_add_X use parameters instead

* modalOpen not act

* Use magnet UID instead of index

* Import missing

* Introduce MAX_PATH_LENGTH constant

* Use TRUE/FALSE instead of 1/0

* Remove path and explicitly pass path to filter_path

* Implement TGUI

* fix styling

* Fix Cmd undefined proc

* bring back path

* Clear magnets before relinking

* Open modal with context

* Add fingerprint then handle modals

* Remove redundant operator

* Fix speed in ui_data

* Fix act modal never returning false

* Show current path progress

* Fix max path

* Fix modals

* Fix lint warnings

* Fix comments not updated in constantization

* Fix missing arguments

* Reimplement path fully

* Fix path buttons not working

* Start at Magnet#1

* Override signals

* Fix frequency appearing in wrong format

* Fix remove buttons not working

* Add default value for unknown path codes

* default arguments for ui_interact

* Fix modals finally

* Fix remove buttons again

* Last constant not converted

* Update tgui bundle

* prevent probe if autolink is on

* Use locateUID

* Fix not being able to remove last in path

* style fixes from code review

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

* implement code review requests

* prettier format

[ci skip]

* rename new_value

[ci skip]

* Remove hardcoded stepPixelSize

* [ci skip]

* Build and update tgui

* changes from code review

* [ci skip]

* prettier

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: tgui builder <41898282+github-actions[bot]@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-11-14 13:11:17 +00:00
Adrer
802ab71c02 Adds a confirmation prompt to all OOC events in the secrets panel. (#22959)
* Secret confirmation prompt

* Update code/modules/admin/topic.dm

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

* Added confirmation promts

* Requested change

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-14 13:02:19 +00:00
Aquilar
d27ead5c0e fixes admin given assassinateonce objective. (#23177)
* fixes admin given assassinateonce

* replaces accidently removed comment

* requested adjustments
2023-11-14 13:01:32 +00:00
GDN
8b874ada80 using the storage implant's action button while it's activated now closes the implant (#23182) 2023-11-14 12:53:13 +00:00
GDN
c0a18da362 Robotic consoles now requires RD access to blow/lock borgs (#23181) 2023-11-14 12:53:00 +00:00
Sadhorizon
1bc20df734 Makes lavaland outpost (and gulag) less annoying to fix. (#23163)
* Makes lavaland outposts less annoying to fix.

* explosions work correctly!

* another outpost oversight that slipped in

* plating deconstruction fixed
2023-11-14 12:52:21 +00:00
DGamerL
291daafb46 Potato batteries now have a minimum max charge of 1 (#23159)
* Easy fix

* Wrong fucking proc
2023-11-14 12:51:42 +00:00
1080pCat
e2ffb8a882 Engineering borg nerf (just their decompiler ;p) (#23227)
* Engi borg nerf

* Update code/game/objects/items/devices/flashlight.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/items/weapons/storage/fancy.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/mob/living/simple_animal/friendly/lizard.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/modules/projectiles/ammunition.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update lighters.dm

* Update spiders.dm

* reverts some that maybe should stay

* oops

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-14 12:51:13 +00:00