Commit Graph
24143 Commits
Author SHA1 Message Date
ff4277d5e3 Removes command from being eligible for round start antagonist (#28173)
* Off with the heads

* Apply suggestions from code review

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

* Actually adds the restrictions to dynamic

* Makes telegun hijack only for scientist

* Update code/game/gamemodes/cult/cult_mode.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2025-02-11 11:40:44 +00:00
0e558089ac Refactor Fire Alarm item_interaction() (#28136)
* Update firealarm.dm

* revert

* Update code/game/machinery/firealarm.dm

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-02-10 04:01:29 +00:00
Vi3triceandGitHub c1d08844df don't spout nonsense and still make it end you when needed (#28093) 2025-02-10 03:31:37 +00:00
da966159c3 Adds medical beamgun for Odysseus (#28162)
* dont cross beams

* it just works

* energy

* varupdate

* finally fixes the runtime

---------

Co-authored-by: Bmon <no@email.com>
2025-02-10 03:24:11 +00:00
PopeDaveThe3thandGitHub 3ace66e481 [LORE] Replaces all uses of the word "intergalactic" in code (#28203)
* begone

* Update SSshuttles.dm

* Update mail.dm
2025-02-10 03:02:09 +00:00
404f11fa4c Feature: Clown recycler, a new Cmag effect (#28233)
* banana touched recycler

* 2 returns

* droppable clothing

* no more clown genes

* foghorn sound effect

* ITS HARMLESS

* review

* Update code/datums/spells/banana_touch.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

* Update code/datums/spells/banana_touch.dm

oh theyre 2

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Toastical <vnndvp@gmail.com>

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Co-authored-by: Toastical <toastical@toaster.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-02-10 02:56:18 +00:00
1080pCatandGitHub 4ba6266516 exploit fix (#28319) 2025-02-09 23:51:38 +00:00
d9e6e40ed0 The Great Fire Extinguisher Refactor (#28005)
* Creation (suffering), success

* AGHHHH! SPACES!

* Update watertank.dm

* comment update

* Apply suggestions from code review

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2025-02-09 18:13:20 +00:00
32c9d4d682 Slime People and IPC; Imitating Species Cosmetically. (#27359)
* Pain

* More transparency / alpha

* Vulp + Name override

* more transparency alpha stuff

* Reworks species subtype for slimepeople

* Iteration 3...

* Me when initial

* 60 - 61

* Character.dm select query changes.

* 61-62

* The real 61-62

* Update to IPC imitation

* +63-64.sql
> species_subtype after pda_ringtone

IPC identity configuration surgery.

Slime "Morph" action: 10 seconds. Allows a slime person to change how they look.
> Same cost as regenerating a limb.

Link processing subspecies implement.

* Pain2

* SQL

* Frankenstein monster fix

* Slimify! ...no longer applies to robotic limbs.

* 220 Alpha to 200

* Ordering issue fix.

* Last ordering issue.

* aa review, paradise_schema.sql

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2025-02-09 15:59:57 +00:00
KenionatusandGitHub 59377ad52d turn EncodeDNABlock proc into a define (#28186)
* turn EncodeDNABlock proc into a define

* changes spelling of EncodeDNABlock to all caps

This is to reflect it now being a define.
2025-02-09 09:22:38 +00:00
ContrabangandGitHub efdb19ac7e Fix cult dynamic cost (#28304) 2025-02-09 05:09:09 +00:00
ContrabangandGitHub 2d998b8317 Cult is now part of dynamic (#28236)
* Adds cult to dynamic

* declare result

* more dynamic stuff

* config

* comment

* tweaks

* numbers changes
2025-02-08 17:10:21 +00:00
warriorstar-orionandGitHub 8e4dc6165b Separate station/unit tests and disable lavaland procgen and ruin spawning in tests (for now). (#28106)
* Separate station/unit tests and disable lavaland.

* add CI/local test conflict check back
2025-02-08 17:09:00 +00:00
ContrabangandGitHub f9f3b4aac6 Ports TG lazy-loading of map templates using turf reservations (#28101)
* kills off heaps

* turf reservations

* lazy loading map templates

* atmos + a comment

* port LISTASSERTLEN and rename a proc

* CI happy

* yes

* oops

* removes blocks air and adds comments
2025-02-07 10:15:08 +00:00
MiraandGitHub 659c4bb47e Add debug research notes (#28074)
* debug research notes

* delete /obj/item/research

* remove researchnotes type
2025-02-06 14:40:55 +00:00
DGamerLandGitHub 16407c641b Makes ui buttons call the right proc (#28267) 2025-02-05 21:32:56 +00:00
DGamerLandGitHub 1c4a5180ed Fixes runtimes when you talk with a cig butt in your mouth (#28250)
* Minor fixes

* Oops

* Funnyman review
2025-02-05 21:26:20 +00:00
CRUNCHandGitHub fdc37eae63 Modernizes and Enhances the Ancient Space Station (#27878)
* Update oldstation.dmm

* Update oldstation.dmm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update oldstation.dmm

* Update oldstation.dmm

* Machines

* it works

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Update oldstation.dmm

* Update oldstation.dmm

* Update oldstation.dmm

* Update oldstation.dmm

* CI

* CI (again)

* Adds diamonds (from minecraft)

* Wow that's a lot of mould, that stuff can't be good for you...

* Remove diamond, add more ore rock

* Very minor polish

Adds missing firelocks, removes an unwanted access helper, adds a floor clutter decal.

* Update oldstation.dmm

* Update oldstation.dmm

* Update oldstation.dmm

* Update oldstation.dmm

* Update oldstation.dmm
2025-02-05 20:29:36 +00:00
ContrabangandGitHub 3ac3fe2157 bongo (#28263) 2025-02-05 20:13:31 +00:00
Charlie NolanandGitHub c4a378e571 Make vended items land on the vendor again. (#28245) 2025-02-05 18:27:49 +00:00
Charlie NolanandGitHub 37dfa541c3 Spiderlings on move_manager (#28244) 2025-02-05 18:22:47 +00:00
a8a580b2f4 Scary Computer Resprite (#27853)
* Resprites Computers

* PR time

* Removed Shadows, Removed Accidental Pixelstrip, increased consistency

* Apparently there was a merge conflict.

* Construction Fix

* Wire sides fix

* Backsprite Changes

* typo fix

---------

Co-authored-by: ExusA <67055922+ExusA@users.noreply.github.com>
2025-02-05 18:21:53 +00:00
CRUNCHandGitHub eab51e167d Migrates /obj/item/scratch to the new attack chain (#28177)
* Update scratch_card.dm

* Update scratch_card.dm
2025-02-05 15:15:13 +00:00
1080pCatandGitHub e7cada2c0b [Metastation] Adds a new area for the exterior of the supermatter chamber, so one apc doesn't power two seprate rooms (#27895)
* Remaps the engineering break room on metastation

* Update metastation.dmm

* Update metastation.dmm

* Revert "Remaps the engineering break room on metastation"

This reverts commit 2e68e661ec.

* redoes it entirely
2025-02-05 14:46:35 +00:00
ContrabangandGitHub e3f73e178d Changes a lot of lighting colors, ranges, and powers (#28226)
* 8u hiubntgvby9 gb

* colors

* undo airlock

* bluer light

* spaghetti review
2025-02-04 19:30:09 +00:00
MiraandGitHub 89e32a5e0f Fix appearance changes from the mirror resetting on any UpdateAppearance() call (#28125)
* add APPEARANCE_UPDATE_DNA flag

* kind of fix
2025-02-04 08:14:50 +00:00
dfd642799c Cigar(ette) butts now stay in your mask sot when they burn out (#27989)
* FINALLY

* Try to fix linters

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-02-04 08:02:39 +00:00
Vi3triceandGitHub 8a47c1a835 Clean up firedoors and add proper emag behavior (#28087)
* That was a lot of running around

* This ordering is better

* Update areas.dm

* Update firedoor.dm
2025-02-02 19:14:07 +00:00
Charlie NolanandGitHub b56c3908d7 Kill some jerks (#28224)
* Kill some jerks

* Less jerky vehicles, too.
2025-02-02 17:09:38 +00:00
94c46040ea [FEAT] Adds Federation combat webbing (#28085)
* the webbening

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

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

* Update trader_organization_spawners.dm

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

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

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

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2025-02-02 16:35:37 +00:00
Vi3triceandGitHub 7bf8a6ab9c He's toast (#28110) 2025-02-02 02:56:30 +00:00
Charlie NolanandGitHub 9ce95f5cd4 Custom vendor bag drag&drop (#28180) 2025-02-02 02:29:24 +00:00
760a6f3466 magic key go in backpack again (#28189)
* magic key go in backpack

* better way

---------

Co-authored-by: Toastical <toast@toaster.com>
2025-02-02 02:28:00 +00:00
ContrabangandGitHub 81e777b6d0 [s] Fixes an exploit (#28213)
* [s] Fixes an exploit

* oops
2025-02-01 17:01:33 +00:00
BurzahandGitHub 01f31d3886 Dynamic Traitor Cost Adjustment (#28132) 2025-01-31 21:24:11 +00:00
MiraandGitHub fe53f56d8b Fix standing corpse when unbuckling it from a meat spike (#28037)
* fix lying angle

* it's not even necessary
2025-01-31 20:56:10 +00:00
ExusAandGitHub 22865d67f6 Potted plants size categories (#28046)
* Updated potted plants

* Proper randomization and reorganization

* Update Kirbyplants on maps

* Remove redundant icon_state

* Revert "Remove redundant icon_state"

This reverts commit bf51470687.

* Update icon-state for generic kirbyplants

* Fix Initialize argument

* Typo fix

* Typo fix 2

* Typo fix 3

* Update plants.dmi

* Add typepath update script

* Add hiding to medium plants and hiding feedback

* add names indicating size

* add 2 more medium plants to medium

* typo fix
2025-01-31 15:52:30 +00:00
warriorstar-orionandGitHub b7b3149b7f Fix portals floating in space. (#28097) 2025-01-31 15:52:05 +00:00
6ef209d931 Migrates Borg Gripper to New Attack Chain, Fixes Some Bugs (#28139)
* Creation

* Update firealarm.dm

* Update firealarm.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update cyborg_gripper.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2025-01-31 15:50:15 +00:00
Vi3triceandGitHub 9a7aee88bd Cauterize surgery checks for lit implements, tweak lighter/flamethrowers/cautery so they deal burn when appropriate (#28141)
* stay cool

* Cautery is also weird like that too
2025-01-30 05:26:13 +00:00
MigratingcocofruitandGitHub f47f0de0b5 Corrects the pressure readouts on non-detailed gas reports (#28174) 2025-01-30 05:23:00 +00:00
Charlie NolanandGitHub 73c94dbc83 Prevent a source of MC failures. (#28169) 2025-01-29 07:12:19 +00:00
Charlie NolanandGitHub 85d60b6c64 Fix a vending bug (#28168) 2025-01-29 07:10:14 +00:00
a6d347e14a Custom, crew-buildable vendors (#28009)
* Buildable vendors.

* Lint.

* I think this is right?

* It's already IN their hands.

* Lint, re-check item after prompting for price.

* Fixes.

* Review fixes, working dissassembly again.

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Restrict appearance to buildable vendor sprites.

* tyop fix

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2025-01-28 22:00:14 +00:00
4c72e2c11b fixes door remotes (#28140)
Co-authored-by: Toastical <toast@toaster.com>
2025-01-28 21:19:27 +00:00
DGamerLandGitHub 452c80e859 Removes tourettes (#28153)
* Removes tourettes

* Removes twitchblock
2025-01-28 21:04:52 +00:00
DrsmailandGitHub 81775e23d6 [FIX] Follow up PR on "Better slices" (#28146)
* Changes from  DGamerL review

* Adds /sliced to foods i missed

* Adds repath.txt

* Swaps left and right in repath file

* Remove slice path restriction for sliceable

* More suggestions from code review by DGamerL
2025-01-28 21:04:03 +00:00
MiraandGitHub d28d740216 Fix some cases of silicons teleporting items on put_in_hands (#28017)
* fix some cases

* forceMove

* replace usr with user
2025-01-28 21:03:31 +00:00
e01a133a3d Fix camera console feeds not following moving cameras (#27851)
* Fix unmoving video cam feeds.

This change refactor the screen-setting logic in camera consoles to its
own method, and additionally calls that method whenever a video camera
is moved, if that video camera's feed is being watched by a camera
console.

* Reduce follow lag and add stabilization to vidcams

Extracts camera follow lag into a variable on video cameras called
`update_viewer_cooldown_rate` and reduces it from 3 to 2 seconds.
Additionally, adds another variable on video cameras called
`update_viewer_stabilization_rate`, which updates all tuned-in camera
consoles with the new position of the video camera a final time, so the
feed remains centered on the camera.

* Change video camera feed follow to use signals

* Fix unmoving camera console feeds

Makes camera consoles refresh their feeds every 2 seconds as long as
they have active watchers. This fixes camera bugs, ERT cameras, video
cameras (including the journalist's advanced video camera), and any
other mobile cameras on a console's camera network.

* Replace manual camera feed cooldown with process()

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>

* Update Camera Console autodoc to reflect process() implementation

---------

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
2025-01-28 20:49:52 +00:00
0249a8dc96 Office Chair Overlapping Tweak + Slightly better layer logic for chairs (1 line lol) (#27844)
* Add Office Chair to the Armrest system, tiny refactor of armrest system.

* Implicit armrest null from DrSmail

Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/stool_bed_chair_nest/chairs.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Yeah so I impulsively ported the entirety of this system without knowing what it did

* Revert "Yeah so I impulsively ported the entirety of this system without knowing what it did"

This reverts commit d4edb72a3b.

---------

Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>
Co-authored-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-28 20:49:12 +00:00