Commit Graph

27884 Commits

Author SHA1 Message Date
AffectedArc07
5e5c75bf48 Adds toggles3 (#27397) 2024-11-24 14:23:27 +00:00
Contrabang
f978108c74 Fixes surgery delays (#27440)
* Fixes surgery delays

* easy fix
2024-11-23 22:03:53 +00:00
warriorstar-orion
586805a318 refactor: Migrate more random_spawners to random/spawners and mapping helpers. (#27017)
* refactor: Migrate more random_spawners to random/spawners and mapping helpers.

* set script PR number

* maybe using a reserved keyword isn't a great idea

* oh i guess we're done

* whoops

* make code actually work

* gnarg

* rerun updatepaths for recent changes

* rerun updatepaths for recent changes

* fix build
2024-11-23 14:23:24 +00:00
Kaelthorian
c044ff1216 Adds a new candy , chocolate bar, to the vending machine. (#27086)
* Adds a new candy , chocolate bar, to the vending machine.

* Update candy.dm

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

* Update candy.dm

No more Omniforge corp , better for lore this way.

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

* Update candy.dm

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

* Fixing the choco icon name.

* Renamed the chocolate bar to Delux Chocolate-bar and changed the icon to something more chocolate like. (CO)

* Name Change

* Update candy.dm

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

* Moved the obj from candy to junkfood.

* Change fix

* Update code/modules/food_and_drinks/food/foods/candy.dm

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

* Update code/modules/food_and_drinks/food/foods/junkfood.dm

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

* Fixing names and icons.

* Update generic_vendors.dm

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>

* icon update

---------

Signed-off-by: Kaelthorian <176922386+Kaelthorian@users.noreply.github.com>
Co-authored-by: RTProductions <RoleplayTenkaichiResurrected@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-23 14:19:45 +00:00
DGamerL
9ab117a1a3 Recounts rise_number and related variables every once in a while (#27393)
* Recounts cultists every once in a while

* Update code/modules/antagonists/cult/team_cult.dm

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

* Remove old check

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-23 13:51:53 +00:00
SteelSlayer
3a5bfaa104 Revert "init (#27394)" (#27429)
This reverts commit fc3dcebd7d.
2024-11-22 19:27:53 +00:00
Bm0n
fc3dcebd7d init (#27394)
Co-authored-by: Bmon <no@email.com>
2024-11-22 19:12:36 +00:00
Toastical
cb1e9df8be Adds plasmaman envirosuits to departments (#27255)
* Added envirosuits to departmental vendors

* added envirosuits to garment bags

* added mining envirosuit to mining wardrobe locker

* fixed genedrobe organization
2024-11-22 18:13:35 +00:00
azulez
c3cca9df90 Adding and wiring some new guitar sounds. (#27184) 2024-11-22 13:54:01 +00:00
Migratingcocofruit
24dc69d8b1 Particle beam now consistently imparts the singularity with energy and only does so once (#27415) 2024-11-22 13:11:38 +00:00
kyunkyunkyun
e333cd98f5 fix (#27420) 2024-11-22 13:10:44 +00:00
warriorstar-orion
9009e3a861 refactor: /New -> /Initialize: simple animals (#27265) 2024-11-21 05:05:03 +00:00
Pidgey
9e6d40514a Fixes #26844 - Labeled condiment bottle loses its label when contents change (#26897)
* Fixes #26844

* removed some extra whitespace

* camel case'd everything that wasn't inherited and also switched seed lavelling to use the new update_name()

* ...and a little to the left...

* Alright, that's all set, hopefully!

* Update code/datums/components/label.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>

* Picky, picky.

* Update code/datums/components/label.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>

* Update code/datums/components/label.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>

* Update code/datums/components/label.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>

* One more tweak, hopefully.

---------

Signed-off-by: Pidgey <35320204+PidgeyThePirate@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2024-11-21 02:57:01 +00:00
Daylight
0f272d16b5 Reverant can now hear and speak chat (#27282) 2024-11-21 02:55:27 +00:00
Qwertytoforty
e99d167cda [s] no, bad, no good, icky (#27413) 2024-11-20 21:29:12 +00:00
ROdenFL
59dd3a645d add: minesweeper PDA game (#26860)
* minesweeper with no style

* less string operations

* review and aylongo tgui changes

* bundle

* minesweeper with no style

* less string operations

* review and aylongo tgui changes

* bundle

* bundle

* bundle

* silent. pda is booming

* codestyle

* review

* revert

* Apply suggestions from code review

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

* adjusts the name of a proc

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-20 16:40:57 +00:00
Hayden Redacted
f56c5dfbdf Adds Space Ruin: Voidhopper of Nexus (#26809)
* added Russian Nians

* adds a new space ruin Voidhopper of Nexus aka freighter

* forgot a quotation mark

* Convert maps to TGM

new         : _maps/map_files/RandomRuins/SpaceRuins/freighter.dmm
new         : code/modules/unit_tests/atmos/test_ventcrawl.dmm

Automatically commited by: tools\mapmerge2\fixup.py

* fixed file format of the ruin

* renamed Russian Nians to Soviet Nians

* see above

* down with russian nians, long live soviet nians

* added a ruin paper per Warriorstar's request

* the name russiannian just will not be fully replaced

* forgetting commas and adding a new subtype of paper for the shipping manifest

* I think using quotation marks is causing me issues

* further removal of the term "russian" in preperation of a PR removing lots of referrals to russia

* added some new Poly voice lines

* accidentally commited the wrong PR...

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* made the shipping manifest ticked

* worked on the perspective of some stairs

* made changes requested by warriorstar

* changed formatting of the sovietnian's loot

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* forgot to add a new line

* i think this is causing the tests to fail perchance

* purging the term russian to be in line with a recent PR doing the same

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* fixed sovietnian to snake_case

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* i may forget snake case exists

* second time's the charm like a snake's two fangs

* added warriorstar's suggestions

* reverted a file that was accidentally converted

* fixed merge issues

* added an extra line

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

* Update code/modules/awaymissions/mission_code/ruins/nian_freighter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-19 21:17:11 +00:00
warriorstar-orion
16672e4f3d refactor: Elementize decals. (#27104)
* refactor: Elementize decals.

* fix for cases of managed_overlay being a single item

* Update code/datums/elements/decal_element.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* review comments

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-11-19 18:16:56 +00:00
Contrabang
1cda30a19f Makes some code tidy (#27391)
* erguertbngio3eunf3o2we4if

* woop de doo
2024-11-19 10:51:58 +00:00
Bm0n
a44c3cda42 Fixes HIDEJUMPSUIT and HIDEGLOVES invis flags Edit: Now with HIDEEARS!!! (#27232)
* fix

* HIDEEYES

---------

Co-authored-by: Bmon <no@email.com>
2024-11-18 23:54:51 +00:00
Bm0n
ea7295bc9b Fully adpots previously ported bottle sprite and fixes reagent overlays (#26962)
* test 1

* Bottles

* quick fix

* brighter reagent bottle

* removes old lids

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-18 23:53:17 +00:00
Bm0n
98b48c5ca2 fix (#27350)
Co-authored-by: Bmon <no@email.com>
2024-11-18 23:52:23 +00:00
PopeDaveThe3th
b3c1890462 [LORE] Extensive Modsuit Lore Drop (#27119)
* modsoup

* Update code/modules/mod/mod_theme.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/mod/mod_theme.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/mod/mod_theme.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* ogre

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update mod_theme.dm

Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* yep

* suits

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* Update code/modules/mod/mod_theme.dm

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

* changes

* taka

* Update code/modules/mod/mod_theme.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* crunch changes

* Update code/modules/mod/mod_theme.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>

* Update code/modules/mod/mod_theme.dm

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

* single letter typo

* somniworld suggestions

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Git-GoR <58085266+Git-GoR@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-18 20:49:38 +00:00
Chap
6f5441fe08 [s] [FIX] Exploit fix (#27387)
* That's illegal

* Requested changes

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-11-18 16:11:35 +00:00
Chap
1a476eb501 [FEATURE/TGUI] TGUI agent ID (#26937)
* initial commit

* tgui patch

* more fixes

* It's Assistant now, not Civilian

* review suggestions

* make it tsx

* update tgui bundle

* code quality

* fix choosing assistant

* convert idcard skins to asset

* use ranks + some quality updates

* TGUI agent ID (Russian edition)

* Fixed new_appearance

* Job_icons

* DME updated

* Changed icon ordering

* Updated comment

* Add crew_list

* Your to ID

* WE MUST PLEASE THE LINTER GODS. Also DMIcon instead of assets

* Fixed the HUD icon

* var instead of proc

* Move hud_icon declaration

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Move agent ID to seperate file

* Job_icon first

* Requested changes

* A little more sanitization

* Update tgui/packages/tgui/interfaces/AgentCard.tsx

Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Update tgui/packages/tgui/interfaces/AgentCard.tsx

Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Bundle update

* WE MUST PLEASE THE LINTER

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: larentoun <larentoun@gmail.com>
Co-authored-by: larentoun <31931237+larentoun@users.noreply.github.com>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Arthri <41360489+Arthri@users.noreply.github.com>
2024-11-17 22:25:02 +00:00
Toastical
0d266f6247 Multitool cable pulse message is now outputs in regular chat rather than the combat log (#27372)
* cable multitool pulse will no longer spit out results in the combat log

* made the cable pulse msg prettier

* Update code/modules/power/cables/cable.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

* made the text red

* made the successful message blue again

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-17 11:19:39 +00:00
Сиротка
c721210f45 [CLEAN] Remove 2 outdated lines from crusher code (#27182) 2024-11-16 06:29:28 +00:00
Contrabang
975d9ed8e3 Fixes a bunch of runtimes (#27363)
* hjnbujihbhuji

* uioybgyub

* Fixes a bunch of crunchy runtimes
2024-11-15 11:22:09 +00:00
Burzah
bff89a13f0 Revert "Singulo engine buff (#26929)" (#27360)
This reverts commit 627fe1e059.
2024-11-14 20:11:53 +00:00
PollardTheDragon
f49b312661 New Space Ruin: Drakehound Skiff Wreck (#27056)
* Skiff

* Unathi_Breacher_Ruin

* Fixes illegal file warning

* Uses damage landmarks instead of burnt plating tiles

* Wall changes, decals, space ruin datum

* Rotated consoles, added small shelf of breaching tools

* Config change for map

* Undoes minor config change

* Removes deathsound
2024-11-14 17:58:08 +00:00
Contrabang
8352613d03 Adds CI for missing icon_states (#27063)
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE
2024-11-14 17:58:06 +00:00
Qwertytoforty
da630e1b63 Impliments a new voting system for weekends and wednesday: Hybrid FPTP weighted random from preferences (#26879)
* temporary wip

* the rest of the fucking owl

* Replaces Nodupes with FPTP, and wensday

* ok you are still a little stupid

* c-c-c-changes

* Create 60-61.sql

* Apply suggestions from code review

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

* woe up to date apon thee

* make that up to date

* contras changes!

* thanks contra!

* Update code/__DEFINES/misc_defines.dm

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

* last thing

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-11-14 17:57:58 +00:00
Migratingcocofruit
627fe1e059 Singulo engine buff (#26929)
* iteration 1

* oops

* Okay now it actually works

* remove rad cap

* Adds a singulo monitor

* comments and other fixes

* rebuild tgui

* updates last size now. breach alerts now go before warnings

* oops

* fix console lables for the field gens

* New generator lookup algorithm

* comment added

* sort out the return and checks on temp_gens

* Adds sprites to the singulo monitor

* fix sprite stuff and singulo alert

* rebuild tgui

* Adds a singulo monitor board to RnD.  Uses the correct icon when no singulo is being monitored.

* give commas some space

* Adds a singulo console board to the singulo engine crate

* style fixes and fixes the check for singularity location and type

* Rebuild Tgui

* style fixes and a comment

* Removes redundant brackets

* Correct the check for there being containing generators

* Changes the generator_field variable to a more generic name

* adds a period to a comment

* Restore accidentally modified icons to their original state

* Rebuild TGUI

* Rebuild tgui

* rebuild tgui

* Rebuild TGUI

* rebuild tgui

* TGUI rebuild

* Style fixes

* TGUI rebuild

* rebuild tgui

* rebuild tgui

* Let's see if this works

* I didn't see that merge conflict. Rebuilding again

* rebuild tgui

* Rebuild TGUI

* Review changes

* Changes to the new variable name in the singulo monitor

* Adjusts bar values for each colour according to the reduced energy capacity of the new generators

* Rebuild TGUI

* Review changes

* missed a line
2024-11-14 16:48:38 +00:00
Qwertytoforty
96c88a6122 better pistol sprite by Salted-Zen (#27290) 2024-11-14 09:36:44 +00:00
ExusA
5cd987f464 Adds a new Janitorial "Rover" cyborg skin (#27310)
* Janitor Rover

Adds the janitorial version of the Rover cyborg skin.

* Typo Fix

Jani rover formatting fix

* No-Hat

Currently the code doesn't support different hat offsets for directionals.

* Pink-to-Purple

Changed to a purpler color to better match other janitorial items.

* Deconflict

* Deconflict Again
2024-11-14 09:28:13 +00:00
Hazel
6b0d40542c Updates sprite and description (#27320) 2024-11-13 19:14:34 +00:00
Paul
bd7cbb1a54 Brass light fixtures (#27312)
* add brass lights

* start adding clockwork floor lights

* implement floor lights

* fix an error and add missing brass light sprites
2024-11-13 19:14:31 +00:00
ExusA
4f2c406b00 Adds a new cyborg skin, "Rover" (#27243)
* Rover Cyborg

Adding a new cyborg skin, 'rover'.

* No-Hat

The hat won't fit on its head without changes to how hat wearing works.

* Rename to Rover-Engi

To make way for other department module names.
2024-11-13 19:14:02 +00:00
Mitchs98
0780f53555 fix (#27301) 2024-11-13 18:13:29 +00:00
warriorstar-orion
bfb18b48e4 dmdoc: Some cleanups. (#27242)
* dmdoc: Some cleanups.

* satisfy check_grep
2024-11-13 13:37:37 +00:00
CRUNCH
f6a45ae95e Fixes Autoinjectors and Some Hyposprays Working on Robotic/Missing Limbs, Minor Refactor of can_inject() and Related Variables (#27118)
* Creation

* refinement

* Update hypospray.dm

* Update human_mob.dm

* update

* Update hypospray.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2024-11-13 13:35:47 +00:00
Migratingcocofruit
0218b541f2 Energy field generators Refactor/Tweak (#26919)
* Reduces range for energy seeking of generators, adds energy spreading and changes instances of power to energy. Containment field destructor no longer crashes when it has no connected generators

* review changes

* undef

* removes redundant line

* review changes
2024-11-13 13:23:41 +00:00
Chap
d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743)
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-13 13:02:29 +00:00
Qwertytoforty
c297dde150 [s] Stealth box fix (#27351)
* stealth box fix

* isturf moment
2024-11-13 02:28:11 +00:00
DGamerL
38100d9e52 Removes the last nucleation stuff (#27241) 2024-11-12 00:15:54 +00:00
HMBGERDO
e4af6ca0a9 thermite no more makes walls with 5u max reagents (#27330) 2024-11-11 15:15:05 +00:00
Bm0n
c4bde0d97a Resting offset fix 2 (#27316)
* fix

* revert

---------

Co-authored-by: Bmon <no@email.com>
2024-11-11 15:14:29 +00:00
Chap
6aca80153b [FIX] Kitchen machines no longer accept reagents while running (#27288)
* Cannot add reagents to an machine that is on

* Check if target is refillable, not if it's drainable

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-11-11 15:14:00 +00:00
DGamerL
192692f06a Makes carp not hostile to asteroid mobs (#27313) 2024-11-11 15:12:22 +00:00
Chap
1db9e86083 [FIX] Goliath no longer seems to come to live from mining grenades (#27309)
* Goliath no longer pretends to be alive

* Update code/modules/mod/modules/modules_supply.dm

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-11 15:09:51 +00:00