Commit Graph

10472 Commits

Author SHA1 Message Date
Daniel Lenrd 99e910602f Adds option to select out of 3 Syndicate Bundles (#23465)
* Thanks Ebba

* removing that one datum line

* updated description in uplink

* removes redundant list that is redundant

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

* Moved Comments

* Added Agent Spaces

* added a dot

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

* Update descrption + fix typo

* updated TC prices in comments

* Welcome message + bundle name updates

* Station Name

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* Modsuiter to Augmented

Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* 3TC jacket comment

* Beacon + Naming + Comments

* forgot to save this file

* Empty

* slash formatting

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

* old SRC style

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

* item/item as anything in item

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 17:05:29 +00:00
Sadhorizon e5910559a6 Adds robotics bags. (#23433)
* I present: bags! wowie...

* oops

* this should fix pierre

* changes

* forgor
2023-12-11 16:58:59 +00:00
Daylight a5555a87eb Tools now fit in all versions of the military belt (#23428)
* Tools now fit in all milbelts

* comments

* consistency

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-11 16:58:38 +00:00
Sadhorizon d3ff8c9921 Resprites lockets, makes necklaces craftable. (#23387)
* lockets!

* this shouldn't need directionals, actually
2023-12-11 16:56:44 +00:00
Daylight 6275852fe9 Removes Unused Settings From Game Preferances (#23368)
* Removes all reference of ROLE_NINJA

* By public demand
2023-12-11 16:56:08 +00:00
GDN 864fe29734 defib tweaks (#23277) 2023-12-11 16:54:20 +00:00
DGamerL 004d7d10b7 Refactors is_hot and fixes some issues from the beaker lighting PR (#22964)
* Idk what I'm doing

* The is_hot refactor

* Fixes that I forgot to push before making the PR

* Update code/game/objects/items.dm

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

* Contra review

* TODO: Find out why this isn't working

* Removes the signal stuff for now, this works

* Fixes it all

* Add new signal

* Update code/_onclick/item_attack.dm

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

* Contra reivew

* Ayyy it works

* Merge master

* Forgot this one

* Update code/game/machinery/doors/airlock_types.dm

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

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

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

* Update code/game/turfs/simulated/floor/mineral_floors.dm

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

* Update code/game/turfs/simulated/walls_mineral.dm

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-11 16:53:51 +00:00
BiancaWilkson cbc45c1336 Pneumatic Cannon Refactor (#22956)
* camelcase and snakecase on the same line...

* the rest, i dunno

* PERIODDDDTTTTTT

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

* the

* new variable name

* don't need that

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* lewc's suggestions + new fun var to play with

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

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

* bjam's suggestion

* adjusting settings is now a seperate proc

* swap some stuff around

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-11 16:53:11 +00:00
Henri215 94cefac7cb Adds jani HUDs from Baystation! (#22654)
* Adds jani HUDs from Baystation!

* wrong place

* tweak to sprite

* contra review and tmeporary tweaks to the sprite

* finishing the sprites

* tweak to icon alpha and nv sprite

* typo

* conflict part 2

* test

* final adjustments

* DgamerL review

* fixing sprites

* changing name

* name part 2

* DGamerL review part 2

* wrong value

* nope

* equipment and janitorial categories

* Apply suggestions from code review
2023-12-11 16:52:54 +00:00
Aylong 825c2c8866 Converts Input List to TGUI Input Lists (#23396)
* Part 1

* Testing 1

* Revert "Testing 1"

This reverts commit fc06554b28.

* Part 1.1

* Part 2 - UI Style List

* Preferences lists

* Preferences lists - DONE

* More inputs

* MOOOOOORE

* UI style else

* Last ones

* Double name fix

* Pre-selected Search

* Return Pick Darkness

* Return Pick Darkness

* Missing users

* Some review changes

* Revert MULE lists

* I just hate MERGE CONFLICT label

* List window tweaks

* I think there it is

* why i am stopid

* Update tgui.bundle.js
2023-12-10 19:38:23 +00:00
Sadhorizon a4fb22eb9a Adds kidan radio sprites. (#23330)
* they finally can see...

* uuuh, this file too

* headphone fix
2023-12-07 16:22:41 +00:00
DGamerL 7a53a3e90c Fixes welders costing welding fuel for empty clicks (#23390)
* Nice

* Yeah this is better
2023-12-06 15:36:37 +00:00
Sadhorizon 5f479ea457 Adds a new drip option - cloth handwraps! (#23339)
* drip

* this is unneeded actually

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

sure.

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

* flips item sprite
for now, at least

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:34:15 +00:00
Christasmurf 1f87a821e1 Head of Personnel drip (#23305)
* everything

* dress sprite adjust

* grey coat

* Update code/modules/clothing/under/jobs/civilian.dm

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

* corgi time

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-12-06 15:32:16 +00:00
Henri215 79502445a9 Soap resprite (#23250)
* Soap resprite

* other soaps in hands
2023-12-06 15:31:13 +00:00
Contrabang c8dce33a8a Cleans up a lot of globals a few other vars (#23246)
* i hate globals i hate globals

* more fucking of these

* sirryan review
2023-12-06 15:30:41 +00:00
Qwertytoforty 9ce6730c56 removes the fluff item from moonbase, modifies loot (#23157)
* removes the fluff item from moonbase, modifies loot

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

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

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

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

* compiles

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

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

* pick my hated

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-12-06 15:27:45 +00:00
Mitchs98 ed6adfc7b2 Desert Course - Ice-Cream Edition. Ports Frozen based deserts from TG. (#23099)
* We all scream for ice-cream

* consistantcy

* the despacening

* Sirryan review.

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-12-06 15:27:21 +00:00
GDN 2380faf3ed fixes a table climbing runtime (#23017)
* fixes a table climbing runtime

* should be fine

* oh yeah this too
2023-12-06 15:26:08 +00:00
Aylong effd9e299d Tweak: Nearby Buckle (Second Try) (#22828)
* Tweak: Nearby Buckle

* Adjacent

* It's definitely better

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>

* Small cleanup

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

---------

Co-authored-by: Gaxeer <44334376+Gaxeer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-11-29 13:09:50 -05:00
Contrabang b6601ebd29 Initing empty lists with GLOBAL_LIST_INIT(X, list()) is now prohibited by CI (#23247)
* moreglobals

* comment
2023-11-29 12:41:01 -05:00
Christasmurf a4c0c2f40d Resprites the mime backpack - Pierre the Panda (#23287)
* sprites

* pierre not pete

* description update

* description 2 electric boogaloo
2023-11-29 12:37:48 -05:00
Qwertytoforty 09712e1541 makes 2 wizard weapons less of a pain to use. (#23356) 2023-11-29 12:15:40 -05:00
HMBGERDO 28e54f96b2 make dualsaber great again (#23361) 2023-11-29 12:14:05 -05:00
Adrer e5bbcc1b3f Fixes sord inhand sprite (#23393)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-11-29 12:10:04 -05:00
Henri215 6a109ade7f Moves a few sprites out of items.dmi (#23301)
* fuck you items.dmi

* banhammer
2023-11-24 15:39:20 +00:00
Nathan Winters 0bbc523dad Adds colored shoes to loadout, makes satchels craftable (#23293)
* Add colored shoes to loadout

* Allow crafting of satchels
2023-11-24 15:38:12 +00:00
GDN 18bc75363f fixes water backpacks not being able to have their miser be toggled by clicking on it while it's on your back (#23288) 2023-11-24 15:37:49 +00:00
Nathan Winters 60ee7e11b7 Lets lockers/crates protect food from ants (#23286)
* Let lockers prevent ants

* Refactor ants check; exclude closed lockers and cardboard boxes from turf structure check

* Make the structure check more lenient, convert to typecache

* gnarg

* gnarg 2: Electric Boogaloo

* Minor simplification/optimization
2023-11-24 15:37:20 +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
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
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
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
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 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
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
DGamerL be1f2d9e54 The fix (#23290) 2023-11-16 20:08:49 -05: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
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
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
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
Contrabang 48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777)
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-11-12 20:59:43 +00:00
GDN 35754c77ea Verb cleanup (#22224)
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
2023-11-12 20:19:17 +00:00
Sadhorizon f65d120711 Nerfs the basic plasma cutter. Yep. (#23071)
* Who would ever expect a basic cutter nerf?

* temporary paramedic fix - they get a drill
2023-11-12 20:11:34 +00:00