Christasmurf
5b6a2de4ca
Procedure dmi split + IAA resprite ( #22580 )
...
* dmi split and code stuff - species sprites coming soon(tm)
* species sprites
* update sprite name
* CI errors?
* CRLF to LF
* forgor species code
* Update code/modules/clothing/under/jobs/procedure.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* readds the ability to make cluwnes (how did this happen)
* fuck off shitcode breaking my shit
* Apply suggestions from code review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* forgor to delet extra sprites
* Suggestion
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* booleans
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-09 20:31:38 +01:00
Bjamcham
a53f4e466c
Adds Riot Shield Bashing with Combat Knives ( #22571 )
...
* Knife Bashing
* Decent Code Edition Featuring: Contra
2023-10-09 20:30:04 +01:00
GDN
6df2c2e3d2
Ghost bar ( #22368 )
...
* Ghost bar initial changes
* more changes
* we ball again brothers
* we are (once again) SO back
* Update code/modules/admin/verbs/debug.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/_onclick/hud/alert.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/_onclick/hud/alert.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/cards_ids.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* deck of cards and shittt
* global placement
* Update code/modules/ruins/ghost_bar.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* readded
* hotfix
* zamn
* fixes
* greyfix
* last of the fixes
* can't stop me baby
* bam
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-09 19:47:17 +01:00
Qwertytoforty
c3568f9ea0
you can no longer kidnap people with the syndicate teleporter ( #22723 )
2023-10-08 03:29:16 +01:00
Qwertytoforty
03b0edc82e
fixes flashbangs ( #22743 )
2023-10-08 03:26:53 +01:00
Contrabang
71cc3c5c22
[TGUI HELL] Adds a Shopping Cart System to the syndicate uplink ( #22039 )
...
* hoooooly shit
* slight suggestion rework
* lewc review
* sanity + locking uplink removes 0 amt cart items
* review
* shit forgot to apply this
* update bundle
* m
* bundle
* j
* l
* fix this shit
* pretty
* yea
* they lied
* teegooeye
* tgui
* farie review
* farie review
2023-10-08 00:46:33 +02:00
Git-GoR
d31012330b
The degrilling: map windows no longer have grilles under them unless electrified or space adjacent ( #22273 )
...
* Existing window spawners are not grilled
Adds new grilled versions of window spawners
Spawner icons modified accordingly, new non-grilled ones
* initial commit of map changes
* include all subtype (yellow etc) cables
* Re-grills cyberiad's space adjacent windows
* Re-grills delta's space adjacent windows
* Re-grills meta's space adjacent windows
* Re-grills cere's space adjacent windows
* Regrills all spacefaring windows in SpaceRuin maps
* Fix duplicated window spawners in main stations
* Fix bad delta windows
* Fix wrong meta windows, regrill QM office
* Fix couple of wrong windows in Cere
* Fix several cyberiad windows
* Adress review of missing windows in cere and delta
* Fix missing window in delta next to turbine
---------
Co-authored-by: Warriorstar Orion <orion@snowfrost.garden >
2023-10-05 19:35:46 +01:00
Qwertytoforty
8a941bae66
fixes tabbing in nanny bag ( #22708 )
2023-10-04 20:59:59 -05:00
Burzah
73906ecc96
chem bio-chip logging ( #22649 )
2023-10-03 22:04:31 +02:00
biogod420
d374be622d
added comments ( #22662 )
2023-10-03 13:29:45 -04:00
Contrabang
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
2023-10-03 18:27:51 +01:00
warriorstar-orion
3a1f827041
fix runtimes setting empty crayon message ( #22672 )
2023-10-03 17:44:50 +01:00
ZERO-XZB
2b9ca38824
Bug fix for carrot shivs Fixes #22556 ( #22627 )
...
* carrot_progress
* more carrot testing
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* closernow
* Bugfix for #22556
* Bug fix regarding carrot shivs (#22556 )
* Update code/modules/hydroponics/grown/root.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* testing item.dmi fix
* hopeful items.dmi fix
* Update code/modules/hydroponics/grown/root.dm
Adds Contrabang's suggested parens.
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: ZERO-XZB <temp@temp.com >
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-03 17:40:02 +01:00
Adrer
1b4573cdf7
Adds supply department to agent ID options and cleans code ( #22613 )
...
Co-authored-by: Adrer <adrermail@gmail.com >
2023-10-03 17:16:03 +01:00
Qwertytoforty
73df3fcf14
Antimatter now innacurate without zooming. Sniper projectiles are faster / pass through weak stuff. ( #22506 )
...
* I should port the sniper rifle bot from blood blockade battlefront
* fuck that a
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* variable on bullet
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-03 17:10:55 +01:00
Adrer
2672d02eb3
[s] Martial arts granted by equipped items no longer persist through cloning. ( #22684 )
...
* Martial arts no longer persist through cloning
* Remove unnessecary var declarations
* Combo counter
---------
Co-authored-by: Adrer <adrermail@gmail.com >
2023-10-03 08:47:19 +02:00
DGamerL
53c3e893c2
Fixes Crutches not working properly ( #22660 )
...
* Yippeee
* Proper order
* Update code/game/objects/items/weapons/misc_items.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/items/weapons/misc_items.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-01 16:38:36 +01:00
Contrabang
7e0aa47311
Refactors objectives, expands team functionality, and custom teams ( #22374 )
...
* step 1
* renaming 1
* how could I forget this
* renaming 2
* renaming 3
* add matching proc, even if unused can remove later
* rename team obj to match
* oops
* okay more stuff
* okay more stuff
* fix this stuff
* okay more stuff
* needs_target = FALSE
* OKAY MORE STUFF
* OOPS AGAIN.
* self-review
* more round_end stuff
* stuff 119
* yeah fix that too
* EVEN MORE CHANGES
* grammar
* fix
* s34n review
* fixes custom teams with no antags not showing objs
* makes objectives work properly with teams
* a
2023-10-01 14:14:10 +01:00
DGamerL
0b31343cd1
Refactors the surplus crate ( #22367 )
...
* WOOOO
* We do this now
* This too
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Hmmmm not quite there
* One push
* Aight we ball
* Whoops I gotta run
* WE ARE SO BACK
* Forgor
* Now with even more Cl passing!
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Contra review
* Moving it to crates.dm
* Lewc Review
* Forgot about this
* Fixes contractors
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Uh oh they are giving out too much
* Fixed TC refund
* Whoops
* Update code/datums/uplink_items/uplink_traitor.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Lewc review
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-10-01 12:58:49 +01:00
Octus
2bdd9397aa
Removes Pet Hospital, Adds Althland Corporation Refinery Ruins ( #22287 )
...
* byebyepet
* typo fix
* more typo fixes
* fixes
* another fix
* delete hospital shit
* ok seriously work now you fuc-
* improvements
* changes tempature
* heat proof lattice
* hi qwerty
* test
* ok lmao
* lattice moment
* oopsie!
* ok fuck you
* map update
* yes
* Revert "yes"
This reverts commit 9892a1123277684085+Henri215@users.noreply.github.com >
* henri review
* adds lore
* fix
* fix
* more fix
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-01 12:24:43 +01:00
Sadhorizon
dfd13270e9
Adds a new fauna to lavaland: an abandoned minebot! ( #22173 )
...
* added the file
* works pretty nicely
* forgot these comments
* doubled their spawn chance
* minebot passthrough stuff
* more fluff
* no longer will go to lava tiles
* answered most reviews
* DGL's solution
* makes loot more efficient, minor tweaks
big thanks to DGamer with this one!
* DGL's review
* Update code/modules/mob/living/simple_animal/hostile/mining/abandoned_minebot.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Merge remote-tracking branch 'upstream/master' into outpost_remap_copy
* oops, a lil fuckup
* removes an unneeded var
* removed the landmark iconstate
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-10-01 12:12:11 +01:00
DGamerL
4c976a6e01
Splits up item_inhands.dmi ( #22584 )
...
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
* Fixes jackhammer and glass shard
* Fixes toy Chainsaw
* Update code/game/objects/items/toys.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/items/weapons/weaponry.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Fixes edagger hopefully
* Henri review
* Oops
* First this gone, and now the pain
* Should all be fixed now
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-10-01 11:47:25 +01:00
Luc
e757638648
Kills Check Pulse ( #22501 )
...
* unchecks verbs
* removes method
2023-10-01 11:41:39 +01:00
warriorstar-orion
f8d195f0b7
add crayon message customizer; port TG alphanumeric crayon decals ( #22499 )
...
* guh
* add crayon message customizer; port TG alphanumeric crayon decals
* docs
2023-09-30 08:41:42 -04:00
meow20
f3a5ef74ca
Fixes runtime when clicking an empty coat hanger with empty hand. ( #22577 )
...
* prevents runtime if the hanger is clicked when its empty
* changes recommended on code chat
* Update code/game/objects/structures/coathanger.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-09-30 08:38:14 -04:00
meow20
fb1fd1261b
Prevents alien resin from growing over chasms/lava ( #22589 )
...
* the actual fix commit
* Update aliens.dm
2023-09-30 08:25:57 -04:00
DGamerL
10c1c82c09
We using traits in this house ( #22548 )
2023-09-28 19:32:57 -04:00
matttheficus
5e914948b2
Logs Toy Cuffs/Twimsts Differently from Standard Cuffs ( #22542 )
...
* god i cant believe we have to do this
* im a silly goose
* K.I.S.S.
* better wording
2023-09-28 19:32:26 -04:00
Henri215
9d10226da2
Adds a new crutch mechanic ( #22527 )
...
* hidden compartment
* adjusting text
* NODROP
* Contra review
2023-09-28 19:31:32 -04:00
Fordoxia
cc76b29ff0
Cyborg Upgrade Typo Fix ( #22554 )
...
Fixes some typos and slightly rewords some flavour text for cyborg upgrade modules.
2023-09-25 19:19:17 -04:00
Contrabang
23c4e49eed
[TGUI] Wall safes/secure briefcases ( #22447 )
...
* bam
* fix this
* fix
* thing
* prettier
* tgui
* Update code/game/objects/items/weapons/storage/secure.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* guh
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-09-25 19:19:07 -04:00
warriorstar-orion
ad5e71c9da
add blackbox stats for mail scans/deliveries ( #22508 )
2023-09-23 22:53:43 -05:00
DGamerL
d4a72d4835
Yes ( #22495 )
2023-09-23 19:39:29 -05:00
GDN
f13586300f
pulse demon reopened PR ( #21969 )
...
* proof-of-concept implementation
* clear being_hijacked on death
* it glows in the dark
* oops
* machinery interactions and some fixes
* consistency, correctness, fixes
* stop usage of the \the text macro
* list inits in Initialize
* fix control flow spacing
* review compliance
* event code and some tweaks
* upgradable spell abilities and some tweaks
* how did that happen
* cycle cameras spell
* stat upgrades (no sprites for now)
* tweaking
* sounds
* jecties code
* more tweaks and fixes
* some review stuff
* alt-click user param and charger icon fix
* Remove unused default amounts in objectives
* Comply with sirryan review (part 1)
* Move isapc definition
* Add autodoc comments to all pulse_demon vars
* Give random number in name on init
* Fix merge conflicts
* Remove pulse demon from traitors on Destroy
* Fix mulebot relaymove override
* Fix airlock TGUI actions
* Fix loop over mobs in cablehop
* Attempt to fix overload runtime
* Half-fix gun cooldown issue
* Fix chat related issues
* Attempt to fix overload runtime (take 2)
* Make ion projectiles collide
* Tweak pulse demon speed
* Make demon survive loc being deleted
* Send message when saved by self-sustaining
* Fix vv_edit_var for charge
* Stop people disabling hijacked bots
* Make demon lose more health when not on wires
* Increase costs of stat upgrades
* Allow demon to change its drain speed
* Stop demon obliterating xenos
* Comply with review (partial)
* Fix issues pointed out in reviews
* Allow demon to drain charge of reachable items
* Adjust volume of demon sounds
* Improve cell interactions
* Bump up event weight (for testmerge)
* Give pulse demon a highlight section on orbit menu
* Give demon an experimental soft-counter to insuls
* Reduce volume of most common sounds (again)
* Update demon cable overlay when required
* Stop AI using its tracking ability on pulse demons
* Add wizard spawner for pulse demon
* Tweak EMP behaviour and numbers
* Clear references in Destroy
* Make appear on end of round credits even when dead
* Prevent pulse demon from detonating cyborgs
* Generalise insulated structure check
* Clean up remaining review requests
* Add new sprites
* some addressed reviews
* Typepath changes, GC fixes
* I blame charlie
* good enough
* die or something
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* even more changes
* final tweaks
* what
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_interactions.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon_abilities.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* bam
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* Update code/game/gamemodes/miniantags/pulsedemon/pulsedemon.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* to_chatn't
* deconflicted
---------
Co-authored-by: unknownuser782 <126365777+unknownuser782@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-09-20 16:25:13 +01:00
Marm
5e8536871b
Cargo QOL + Mail Bag Fix ( #22500 )
...
* aaaaaa
I forgot
* mailn't
Removes QOL.
2023-09-19 21:09:57 -04:00
Marm
ecfaa26cc2
You've Got Mail! Adds Mail system ( #22269 )
...
* heres the mail it never fails
Adds envelopes and its functions.
* It makes me want to wag my tail
Adds new envelope sprites courtesy of McRamon, makes mail bags and envelopess able to be carried by cargo clothing.
* when it comes i want to whail
Makes Wizard and Nukie equip change to off station role. Adds mail crates and functionality/logging for randomly choosing recipients of mail.
* MAAAAAAAAAAAAAAIIIL!!!!
Adds functionality for the mail scanner alongside sounds. Begins the process of making mail arrive on the shuttle.
* MAIL
* THE MAILMAN IS HERE
* MAIL IS REAL
* Give me an M, give me an A, give me an I, give me an L. What does that spell? MAIL.
Finalises pre-review mail features, adding the mail scanner to cargo tech loadout/autolathe.
* Update code/game/gamemodes/nuclear/nuclear.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/modules/shuttle/supply.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/jobs/job/support.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/structures/crates_lockers/crates.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* check out what you got now
Removes unused sprite bloat.
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
* First few Contra reviews
* Second batch
* Cl doesn't fail anymore
* Even more fucking reviews
* Doesn't quite work yet but we're almost there
* WHEN DOES IT EEEEEND
* I have no energy to make a blues clues reference
More commits to respond to reviews
* God I miss Steve
Adds hand sprites to mail scanners
* Woooo Mail works again
* Science envelopes
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* my god it worked
II hate it
* Bread and Circuses
splits up service envelopes into two categories, addresses other reviews.
* Lewc review - needs testing
* Almost there
Changing lists and more.
* Last fix
* IT IS ALL WORKING NOW
* Mail. Is. Done.
Final pass.
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* The fix
* Just this one too
* Lewc review
* mail?
yeah
* Begone, ye powersink
* Sirryan review
* Update code/__DEFINES/economy_defines.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/controllers/subsystem/SSeconomy.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Update code/game/objects/mail.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Wjpp[s
* Removes useless comment
* We ball
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2023-09-19 19:30:03 -04:00
LiberatedWaveMan
e09be2b54e
You got a fuckin' problem mate? Adds the glass shiv (attempt 2) ( #22416 )
...
* Redoes the Shiv PR, adds shiv (ready to go)
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/crafting/recipes.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update kitchen.dm
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2023-09-19 22:47:53 +01:00
Contrabang
cedb419059
Adds the adminspawn debug outfit ( #22223 )
...
* debug outfit
* slip
* fix this
* review
* lewc review
* refactors the huds to be "not shit"
2023-09-19 16:28:04 -04:00
Henri215
9fdf2992be
Ports Rod of Asclepius in hand sprites and moves staves in hands into a new file ( #22250 )
...
* Ports Rod of Asclepius inhand sprites and moves
staves hand.dmi into a new file
* removing for now
* its conflict time
* lets fix this conflict
* ah shit
* here we go again
2023-09-19 18:58:11 +01:00
Qwertytoforty
fe871e4097
moments pass, shattered glass ( #22414 )
2023-09-19 17:02:50 +01:00
matttheficus
a325543848
Logs Cryo/Suicide Amounts for TDM Gamemodes ( #22354 )
...
* logging time
* contra review
* im a silly goose
* RR addition
* sirryan review
2023-09-19 17:01:08 +01:00
HMBGERDO
d1d38d3982
eye stab bypassing everything fix, some med kits not working on use in hand fix ( #22320 )
...
* eyestab no longer bypass pacifism and shields
* medical items not working on activate fixes
2023-09-19 16:58:20 +01:00
DGamerL
630ff3722d
[s] Lowers xenomorph acid damage on living mobs ( #22291 )
...
* What does acid taste like?
* Contra Review
* Contra Review
* Contra Review
* Update code/modules/mob/living/carbon/human/human_defense.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
---------
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2023-09-19 16:58:01 +01:00
tristan1333
5028f63cd7
handheld mirror traitor item ( #22042 )
...
* Adds handheld mirror item and adds it to traitor items
* Adjusted cost for economy refactor
* Revert "Adjusted cost for economy refactor"
This reverts commit f31cbae8be96800819+GDNgit@users.noreply.github.com >
* removes redundant proc
* Adds inhand sprite and adds herald cloak functionality
* Revert "Adds inhand sprite and adds herald cloak functionality"
This reverts commit 3b2531f50996800819+GDNgit@users.noreply.github.com >
2023-09-19 12:03:44 +01:00
Contrabang
cb909df3cf
Fixes dusting. ( #22344 )
...
* dust properly
* oops
* Update code/_globalvars/traits.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-17 20:19:28 -04:00
Sadhorizon
527fb7e5c2
gut lunch time! ( #22285 )
2023-09-17 20:18:34 -04:00
DGamerL
3693e6d620
Epi autoinjectors are now a subtype of autoinjectors, the basetype is now empty ( #22261 )
...
* removing the useless feature
Yes this removes it from all autoinjectors
No I am not going to publish this
* WOOOOO REGEX WORKS
* Almost forgot the entire reason of this PR
* Oversight
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* Update code/modules/reagents/reagent_containers/hypospray.dm
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
* Lewc review
* Update code/game/objects/items/weapons/storage/bags.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2023-09-17 20:15:43 -04:00
Sadhorizon
1465e5d4d3
Robodrobe and Robotics Lockers resprite ( #22425 )
...
* uniqueness
* tweak for robodrobe
2023-09-17 23:59:39 +01:00
Luc
1fe3a2187d
fix icon state for depot reactor ( #22449 )
2023-09-17 21:02:28 +01:00
Henri215
baf810e53f
Being slapped now wakes you up ( #22408 )
...
* wake up already
* moar
* better now
* Update code/game/objects/items/hand_item.dm
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
* lets make this run
---------
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2023-09-17 18:24:30 +01:00
