Commit Graph
7224 Commits
Author SHA1 Message Date
ExusAandGitHub a7bcbd22ba Hand Tele resprite V2 (#27673)
* Resprites the Hand Tele

Updates the Hand Tele sprite.

* Iterates on the hand tele design

Made some changes to the hand tele according to feedback.

* Fix icon import error

Fixes a change in animation delay

* Third hand tele iteration

Converts the hand tele to an alternate perspective on request

* Single pixel spot edit

* Updated hand tele resprite

* Minor hand tele edit
2025-01-01 04:37:33 +00:00
9cb9392551 Removes the fake fake trick revolver, and the weird old (cursed)russian one (#27435)
* Removes the fake fake trick revolver, and the weird russian one

* ARRGUH

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* i hate merge conflicts

* AAAAAAAAAAAAAGHu

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2025-01-01 04:01:55 +00:00
PedroandGitHub 06bbd7768b Hotfix (#27780) 2024-12-31 01:58:55 +00:00
b55bef2ed2 Nanotrasen Career Trainer - REVIVAL (PT1) (#26512)
* Nct ID

* Preferences, job creation, access and other stuff

* Sprites, defines, hidden job pref and other stuff!

* Missed a comma

* Sprites updated, clothing code, outfit and id

* Fix a small oops

* Data chip + Sechud icon

* Offstation, access, datachip code, ticket autoresponse and a lot of other stuff.

* Typo, spritesheet fixingg and icon color

* Telebaton removed, not allowed to scan ERT IDs, blacklisted some access

* Applies suggestion

Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Applying Suggestions!

* Forgot to increase the number of slots, oops

* Added a few items that I forgot, applying suggestions.

* Fix check fail?

* Mapping Tools/Icons.

* Office added to all maps, a few modifications to fit.

* Adds ACCESS_TRAINER to who needs it.

* Fixing check fails.

* NCT Beret obj are now where they're supposed to be

* Suggestion

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Sprites fix + NCT flag

* Code Suggestion

* Sprite update

* Suggestions

* Diagoras Office, conflict fix.

* Day 1 fixes, suggestions.

* bundle rebuild

* Fixing a few issues.

* Mapping review + Suggestions

* Fixed check fail.

* Conflict fix + You shouldn't be able to insert the NCT chip into an id console

* Fix map conflicts

* Plasmaman icons and Kidan icon fix

* Conflict fix?

* A few changes following feedback.

* Small description changed, as per requested feedback.

* Suggestions/Fix

* Forgot some mapping issues

* Suggestions

* Fixed?

* Fix linters

* More fixes

* aaaaaaaaaaa

* Christa's reviews

* Naming stuff

---------

Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-30 21:13:52 +00:00
QwertytofortyandGitHub a3508e066e fix magic touch spells false deleting, fix spelling, allow escape (#27736)
* fix magic touch spells false deleting, fix spelling, allow escape

* leaps out of
2024-12-30 18:23:51 +00:00
PollardTheDragonandGitHub 3888b35b40 Removed Wedding Clothes from Chaplain Garments (#27544) 2024-12-30 18:22:34 +00:00
c6ec62f73a Remove ancient random spawners. (#27682)
* Remove ancient random spawners.

* set script PR number

* rest of updatepaths

* Apply suggestions from code review

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-30 18:20:41 +00:00
warriorstar-orionandGitHub 6bf673dbb4 fix borg gripper held item self-activation (#27740) 2024-12-30 14:43:18 +00:00
warriorstar-orionandGitHub c68637011a /New -> /Initialize Migration §2: Stacks. (#27446)
* refactor: /New -> /Initialize §2: stacks

* remove named arg from phazon BS crystal removal

* whoops
2024-12-30 14:36:32 +00:00
QwertytofortyandGitHub 2e38c61dfa it's nothing, it's for free (#27730) 2024-12-23 17:28:52 +00:00
a5726efe0c Extra Plushies + Plushify Spell (#27384)
* Plushie PR

TODO-
Fix borgs becoming mind
Add to smite list
Add diona plush effect

* Fixed Issues

Added alien plush
Added loadout
Yeah

* Apply suggestions from code review

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>

* WIP

Will finish later

* Fixed the various issues

Should be working now! Changed the bread smite to a 'generic item' smite and then made it a specifcally breaded smite.

* Minor typo fixing

And stuff

* WIP Conversion

Converting all the attacks into more sleek attacks, will need to finish.

* Fixes galore

Yippie!

* Russian revolver wasn't working

now you can self-shoot again! Horay!

* You can no longer eat spraycans

IPC clowns everywhere devistated

* Apply suggestions from code review

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

* A tinsy bit of touching up

:)

---------

Signed-off-by: Drakeven <50409888+Drakeven@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@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-12-23 16:09:24 +00:00
Truls20andGitHub 7511539544 Allows wallets to hold candy cash and chocolate coins (#27574) 2024-12-22 16:53:43 +00:00
warriorstar-orionandGitHub 718b5787cb Revert "Fixes for inserting/removing storage items/swapping items between han…" (#27706)
This reverts commit 012e1f1010.
2024-12-22 00:10:33 +00:00
012e1f1010 Fixes for inserting/removing storage items/swapping items between hands. (#27694)
* Fixes for inserting/removing storage items/swapping items between hands.

* Apply suggestions from code review

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

* Fix doc comments

* kill old comment

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-21 21:36:04 +00:00
79bad427c8 Movement cross/uncross implementation. (#26762)
* refactor: Movement cross/uncross implementation.

* wrong var name

* fix unit tests dropping PDAs into nowhere

* Add documentation.

* remove unused constants

* say which procs are off limits

* fix simpleanimal z change runtime

* helps not to leave merge conflicts

* kill me

* fix typecast

* fix projectile/table collision

* treadmills don't cause MC to crash anymore

* connect_loc is appropriate here

* fix windoors and teleporters

* fix bonfires and clarify docs

* fix proximity sensors

Tested with sensors in crates, sensors in modsuits
Tested new proximity component with firing projectiles at singularity
Tested new proximity component with portable flashes
Tested new proximity component with facehuggers

* lint

* fix: polarized access helper false positives

* Revert "fix: polarized access helper false positives"

This reverts commit 9814f98cf6.

* hopefully the right change for mindflayer steam

* Changes following cameras

* fix glass table collision

* appears to fix doorspam

* fix ore bags not picking up ore

* fix signatures of /Exited

* remove debug log

* remove duplicate signal registrar

* fix emptying bags into locations

* I don't trust these nested Move calls

* use connect_loc for upgraded resonator fields

* use moveToNullspace

* fix spiderweb crossing

* fix pass checking for windows from a tile off

* fix bluespace closet/transparency issues

* fix mechs not interacting with doors and probably other things

* fix debug

* fix telepete

* add some docs

* stop trying to shoehorn prox monitor into cards

* I should make sure things build

* kill override signal warning

* undef signal

* not many prox monitors survive going off like this

* small fixes to storage

* make moving wormholes respect signals

* use correct signals for pulse demon

* fix pulse heart too

* fix smoke signals

* may have fucked singulo projectile swerve

* fix singulo projectile arcing

* remove duplicate define

* just look at it

* hopefully last cleanups of incorrect signal usage

* fix squeaking

* may god have mercy on my soul

* Apply suggestions from code review

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

* lewc review

* Apply suggestions from code review

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

* burza review

* fix bad args for grenade assemblies

* Update code/__DEFINES/is_helpers.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <daan.lyklema@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-12-21 08:07:44 +00:00
QwertytofortyandGitHub 2fa2576571 converts traitordevices.dm to activate_self (#27529) 2024-12-19 19:10:11 +00:00
ed626bfadb Ports Different Variants of Nian Plushies and Introduces a Plush Spawner (#27450)
* ports over more nian plushies from shiptest/beestation and introduces plushies into maint loot

* remove a value

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

* removed a value

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

* removed a value

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

* remove a value

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

* Update code/game/objects/effects/spawners/random/plushie_spawners.dm

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

* Update code/game/objects/effects/spawners/random/plushie_spawners.dm

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

* this should fix the conflict

* please let this upload fix the conflict

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

* i need to stop pressing commit as a form of saving, my apologies.

* added the dmi back

* fixing indentation

* removes a comment.

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

* bumps the weight of tools and materials up to 4

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-12-18 15:32:27 +00:00
warriorstar-orionandGitHub bd6450d884 Cleanup ITEM_INTERACT_ flags. (#27640)
* Cleanup `ITEM_INTERACT_` flags.

* replace new uses of old flags
2024-12-17 21:54:28 +00:00
warriorstar-orionandGitHub 02a37c8303 Fix wallets not ingesting cards on click. (#27655) 2024-12-16 03:19:46 +00:00
QwertytofortyandGitHub 0caf77d272 Attack Chain Migration: /obj/item/card (#27556)
* the work so far

* She returns on my TRUE till I ITEM_INTERACT_SUCCESS

* do this too (rip good commit name)

* Did you know? You can stamp ID cards!
2024-12-15 21:06:48 +00:00
0e765746b6 Adds a new TGUI Admin Antag Menu (#27545)
* Adds a new TGUI Admin Antag Menu

* Prettier

* fuck

* oops

* swap this shiiit

* Rebuild

* changes

* hate contractors, simple as

* welp forgot this

* fix

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-12-15 01:39:12 +00:00
1080pCatandGitHub 3c8b9492f8 his grace attack chain migration (#27580) 2024-12-11 16:19:04 +00:00
c6fcd16078 Buffs Brass - Adds a Selection of New Brass Furnishings (#27465)
* creation

* Update clockwork-overlays.dmi

* Update computer.dmi

* Update computer.dmi

* Update Operating.dm

* airlock

* Update airlock_types.dm

* Update code/game/machinery/Sleeper.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-10 16:04:47 +00:00
aa140c1184 Tweak: Magma-ale and space beer are now a bottle subtype (#27407)
* makes magma-ale and space beer bottles instead of cans
replaced all occurences of the cans to the new type

* forgot to rever test_tiny

* path script + repathing

* space bar sleepy beer repath

* Update tools/UpdatePaths/Scripts/27407_ale_beer_repath.txt

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Toastical <vnndvp@gmail.com>

* Update code/game/objects/structures/crates_lockers/closets/secure/bar.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Toastical <vnndvp@gmail.com>

---------

Signed-off-by: Toastical <vnndvp@gmail.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2024-12-07 22:18:55 +00:00
warriorstar-orionandGitHub d23c808e47 Fixes several attack chain call sites (#27553) 2024-12-06 22:20:12 +00:00
584e6b26d5 Adds the RSF Executive Service Upgrade for cyborgs (#27371)
* Adds the Executive RSF cyborg upgrade.

First commit for the Executive RSF with basic functionality.

* Add cheese knife

Adds a cheese knife along with the RSF upgrade to cut the cheese.

* Executive RSF Upgrade functionality.

Adds cheeses, caviar, cheese knife, and reorders RSF code to be neater.

* Nerf cyborg cheeses

Nerfs cyborg cheeses to be worse than chef food.

* Resprites Smoked Cheese

* Fixes power cost calculation

* Cleanup

* Standardize tech and Materials cost

* Adds caviar trash

Adds an empty caviar can.

* Edam and flavor

Add Edam

Adjusts flavors to compete with cheese reagent

* Undo sprinkled donut

Undid changes to RSF donut

* Fix RSF icon missed pixel

* Boolean fix

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* Resprites basic cheese

Resprites basic cheese at the request of @DGamerL

* Update new cheese sprite

Adds wax to the new cheese.

* Delete unused cheese icon

Deletes a prototype cheese icon.

* Readds normal cigarettes to the executive RSF

Adds normal cigarettes back to the RSF at Fordoxia's request.

* Turns caviar from red to black

Rebrands caviar into the fancier, black variety

* Deconflict

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-12-06 14:03:58 +00:00
d663dfc3fb [READY FOR TM] R&D Rework Part 2 - Death to the experimentor (#27472)
* PT1 - Death to experimentor

* I cant fail CI this fast come on

* PT2 - DA -> SA

* CRLF to LF

* Strange icons in the SA now

* Lets give this a go

* AGH

* Dirt

* WORK

* Oops - cere was missing the RD locker

* Map fixes

* Adds delivery chute back

* Warrior review

* Also removes magnetics

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-12-04 17:55:39 +00:00
ChapGitHubadrermail@gmail.com <adrermail@gmail.com>
a0c326c939 [FIX] Slimepeople can pick a bloodtype on agent IDs again (#27509)
* Fixes bloodtype picking for agent ID

* Oops

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-12-03 10:59:04 +00:00
1080pCatandGitHub 04f773a62a People activating a powersink now pokes ghosts with a follow prompt (#27349)
* People activating a powersink now pokes ghosts with a follow prompt

* fixes 'a the powersink`

* slight title change

* changed title again, added another prompt when its about to blos

* Update powersink.dm
2024-12-03 10:50:40 +00:00
warriorstar-orionandGitHub 525c68d617 Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834)
* refactor: Attack chain, initial setup.

* migrate curtain to make dreamchecker happy

* update thurible

* don't call attacked_by separately for legacy attack chain

* remove duplicate proc

* condense similar code, put allowances for legacy code in new procs

* update docs, include diagram source

* add comment on how to update diagram

* fix admonition

* mindflayer updates

* remove commented out code

* clarify all steps

* after_attack should be overridable

* whoops

* retrofit recent changes

* duh, can't restrict this yet because of tool_acts

* i hate ore bags with the fire of a thousand suns

* return correct value for object attack logic

* Various cleanups.

We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.

I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.

* simplify some argument names

* fuck it

* make it do the thing

* Rename CI module call

* Prove that CI works

* improve test output

* aaand fix it again

* fix curtain tool interactions

* fix compile error

* fix compile error

* Better docs, introduce migration plan tool.
2024-12-02 23:36:36 +00:00
ContrabangandGitHub 51a831288e Admin Jsons now have proper assignments and ranks (#27502) 2024-12-01 04:35:23 +00:00
warriorstar-orionandGitHub 0ffa8303a7 Rename all non-snake_case types. (#27268)
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
2024-11-30 19:08:45 +00:00
ToasticalandGitHub 96b4f46560 cloaks fit in garment bags (#27491) 2024-11-30 12:04:37 +00:00
ContrabangandGitHub 734d0166a0 Removes some non-existant typepaths (#27362)
* Adds CI for missing icon_states

* yeah

* more fixes

* more fixes

* seems good

* moar

* fix

* yea

* hrtyhrt

* yeah

* WOE

* Removes some non-existant typepaths

* yes
2024-11-30 12:04:03 +00:00
chuga-gitandGitHub c21be0b102 excludes user from seeing storage insertion message (#27490) 2024-11-30 01:21:09 +00:00
f0ac13b80b [FEATURE] Decal painter (#27036)
* Add_Decal_Painter

* Seperate TGUI file

* Decal painter DmIcon

* Fix some merge errors

* I don't know why this merge is so incredibly fucked

* Update TGUI bundle

* I swear to god

* Fixes DmIcon

* TGUI bundle build

* Remove implicit var

* Final cleanup

* Add decal_painter sprite

* Update code/game/objects/items/devices/painter/decal_painter.dm

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

* Add helper proc for deleting all components of a type from a datum

* Added comments to cycle_style

* Elementized decal fixes

* Use the new decal system

* TGUI bundle

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-29 14:30:48 +00:00
MigratingcocofruitandGitHub 3be13c3997 Fixes some dyed items retaining their original appearance and adds plasmamen helmet dyeing (#27256)
* Fixes dying not changing the color or description of the dyed item, making it appear unchanged when worn.

* adds plasmaman helmet dyeing
2024-11-29 10:52:09 +00:00
chuga-gitandGitHub 32b97afbec fixes some bad html (#27481) 2024-11-29 10:46:51 +00:00
DGamerLandGitHub 392c8fbfad Nerfs the push broom (#27469) 2024-11-27 22:06:39 +00:00
QwertytofortyandGitHub bc41214306 Updates the syndicate combat borg to a cool spider borg (#27332)
* Resprites the nukie cyborg

* whatever fuck you rust g

* god I hate rust g

* suffering

* I forgot to save auugh

* fixed

* please stop silently modifying surgeon

* woe more sprites apon thee
2024-11-27 17:12:16 +00:00
6eb1269d8e Return of the neck slot! (#27188)
* this turned out to be wayyyy more than just a test

* remove bedsheet icons from back.dmi

* hud+better icons

* error fixed

* fixes a few bedsheet icons

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

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

* review

* spacing

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* lint?

* guh

* lint

* TGUI Bundle Rebuild

* test

* fix

* dead golem fix

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-27 17:04:53 +00:00
ContrabangandGitHub 396215501c Machine Frames are now structures and not machines (WTF???) (#27388)
* yes

* yes 2

* consistency

* yes

* rename update paths
2024-11-27 16:51:46 +00:00
5656f3409a [FEATURE] New chameleon pen for forging [signs] (#27128)
* Added a new item - Chameleon pen for Forging signatures and also made a new kit with it and chameleon stamp

* Fixed shorted nemes and replaced spaces with tabs (I hope)

* Last space fixed

* Apply suggestions from code review

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

* Chameleon pen now have same discription as a regular pen, also retested evrething again.

* Apply suggestions from code review and the one i missed by mistake

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

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/datums/uplink_items/uplink_general.dm

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

* changed the cost. Added proper logs. Adjacency checks

* removed duplicated code

* Applied suggested changes from code review

---------

Signed-off-by: Drsmail <60036448+Drsmail@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-11-27 05:16:52 +00:00
09830b2ce8 Language Changes & Lore Pt. 1 (#27257)
* stage 1

* Fix bundle (TGUI was not rebuilt)

* mr worldwide

* LT galcom suggestion

* period

* bundle

* Update code/modules/mob/language.dm

Co-authored-by: Luc <89928798+lewcc@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2024-11-25 11:25:38 +00:00
SchrodingersWolfandGitHub 053470ef90 SS13 isn't that sort of fantasy game (#27364) 2024-11-24 22:38:48 +00:00
ContrabangandGitHub aa2651f659 Unfucks Bulldog Bundles (#27376) 2024-11-24 20:04:40 +00:00
c50ff7ce9c Adds a new spellblade enchantment: Temporal. Also adds lightning knockdown back. (#27314)
* cutting edge

* remove the message admins lmao

* eh name should just be temporal

* undef

* Apply suggestions from code review

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

* updates description, removes shock change as it happens on live now I guess

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-11-23 13:50:39 +00:00
ToasticalandGitHub 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
c9930f6975 [FIX] Makes Borg Stun Arm screwdriver_act() return FALSE. (#27414)
* Update stunbaton.dm

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

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-11-22 13:10:40 +00:00
ToasticalandGitHub 2ec6a3adfc Lit welders will now set flammable people on fire (#27380) 2024-11-19 00:47:50 +00:00