Commit Graph

4154 Commits

Author SHA1 Message Date
Mooballoono
9e0dd390a2 Zippos can light Cigars (#21059)
* Makes it so Zippos can light Cigars

* accidental commit to master

* Zippos can light Cigars

* parentheses were in the wrong spots
2023-05-22 22:06:46 +02:00
Silverplate
73510a18ab Allows proximity mine signs to be used by all traitors (#20977)
* Removes jani mind requirement

* makes arm/disarm of jani sighs traitor only

* Adds mindslaves to usable mind states

* adds prox sign to surplus, standard proability

* Removes thralls from using sign (hacky method)

* allows mindslave useage (not hacky way)
2023-05-21 12:10:02 -05:00
Henri215
5dc6151ce7 Adds a new sound for when the janitor proximity mine is activated (#20976)
* Adds sound to the janitor proximity mine

* here comes the sound

* Not necessary
2023-05-08 16:52:48 -05:00
matttheficus
db2aac4c1b im a silly goose (#21005) 2023-05-02 22:10:33 +02:00
Qwertytoforty
ce78b11870 gives spellblade with lightning grant the user shock immunity (#20949)
* gives spellblade with lightning grant the user shock immunity

* Apply suggestions from code review

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

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-02 21:59:21 +02:00
Henri215
a5efbd32e8 USSP update part 2 (#20926)
* USSP part 2

* swapping old version for new one in some places
2023-05-02 21:59:01 +02:00
matttheficus
fc87927f7b Tool Size Tweaks (#20586)
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
2023-05-02 21:43:06 +02:00
matttheficus
ca6717c0a4 Full Belts No Longer Fit in Bags (#20547)
* The Beltening

* Antag Belt Buffs

* This needs some sanity work, it is currently non-functional

* it finally works

* fix spawn bug + bluespace/laz belts

* comments moment

* im silly + autodoc

* just in case tm

* grammar

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

* better coding practices are fun

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* sane code, thanks sirryan

* better coding practices

* review fixes

* bluespace bag fix

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-05-02 21:19:02 +02:00
DGamerL
0119174c41 Slightly buffs the atmos firefighting backpack (#20912)
* Slightly buffs the atmos backpack
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull request process. -->

## What Does This PR Do
Increases the water cap of the atmos firefighting backpack from 200 to 500, to be more in line with the janitor cleaning backpack
<!-- Include a small to medium description of what your PR changes. -->
<!-- Document all changes, as not doing this may delay reviews or even discourage maintainers from merging your PR! -->
<!-- If your PR fixes an issue, add "Fixes #1234" somewhere in the PR description. This will automatically close the bug upon PR submission. -->

## Why It's Good For The Game
Currently, nobody uses the backpack for anything other than metal foam, as the water capacity is simply too little for any effective firefighting, or nanofrost usage.
<!-- Add a short description of why you think these changes would benefit the game. If you can't justify it in words, it might not be worth adding. -->

## Testing
<!-- How did you test the PR, if at all? -->

## Changelog
🆑
tweak: Increased atmos firefighting backpack capacity
/🆑

<!-- Both 🆑's are required for the changelog to work! You can put your name to the right of the first 🆑 if you want to overwrite your GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the icon ingame) and delete the unneeded ones. Despite some of the tags, changelogs should generally represent how a player might be affected by the changes rather than a summary of the PR's contents. -->
<!-- If a PR has no impact on players (i.e. a code refactor that does not change functionality) then the entire Changelog heading and contents can be removed. -->

* Maybe actually do what the PR says
2023-04-25 21:14:08 +02:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748)
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
2023-04-25 21:13:02 +02:00
Henri215
e5a3192ee0 New sprites for AI modules (#20881)
* New sprites for AI modules

* pranksimov module sprite

* hacked module sprite
2023-04-22 09:45:14 +02:00
GDN
2907806b6a fixes being unable to clean stuff with soap while targeting the mouth (#20880) 2023-04-22 09:45:05 +02:00
Henri215
627a46a068 more options for matter decompiler (#20874) 2023-04-22 09:44:33 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870)
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
2023-04-22 09:44:27 +02:00
Henri215
7f080f2a3c Adds some sounds to lighters/cigs (#20862)
* more sounds for lighters

* final adjustments

* lower volume for light.ogg

* Contrabang review
2023-04-22 09:44:20 +02:00
Livi
1a10d9a569 Fixed custom rollies having nicotine by default (#20757) 2023-04-22 09:27:52 +02:00
Henri215
d65ec2d5e8 Tweaks to greed ruin and die of fate (#20737)
* Tweaks to greed ruin and die of fate

* Delay between effects

* moved and updaated traitor items

* More tweaks to traitor item list

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

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

* Sirryan review

* Lets decrease the money even more

* experimental KA instead of alien pistol

* emp dmg for machines when interacting

* brainloss

* Code improvment

* forcewall removal

* Turning into a list

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:18:08 +02:00
MisterMovie
55454c5347 Tracking implants now emit a GPS signal (and other related features) (#20687)
* Tracking implants now emit a GPS signal (and more)

* lewcc's review

* Sirryan2002's review
2023-04-22 09:17:07 +02:00
Henri215
72402e782b Updates the U.S.S.P with new looks and loadouts for admins v2 (#20669)
* Custom USSP roles for admins

* Added the sprites for new USSP

* conflict part 2

* Elder Gods please make this work

* new style for soviet box

* Added Soviet headset

* lets fix this conflict

* Die conflict!

* Sirryan review

* Apply suggestions from code review

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

* Lets solve this conflict

* Die conflict!

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:16:56 +02:00
Burzah
e85094ed32 ERT Medkit Revision (#20658)
* Update code/modules/reagents/reagent_containers/pill.dm

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* Seperated the Red and Gamma Patch Packs
Changed some colors for the patch packs/pill bottles

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

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

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

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

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

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

* adjustments to patch packs

* format fix

* inheritance adjustment

* adjusted medince to reflect changes to SR

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-04-15 21:59:19 +02:00
Henri215
b705e93a3f less range and volume for garrote (#20863) 2023-04-14 20:20:56 +01:00
matttheficus
ced990a21c Halves Cuffing + Garrote Sound Range and Volume (#20674)
* less echolocation

* Update garrote.dm

* hal review
2023-04-08 14:34:31 +01:00
GDN
85c08eee61 fixes #20754 (#20755) 2023-04-04 09:50:40 +01:00
Henri215
cb4a29037f Adds the trash bag of holding upgrade for janiborg (#20548) 2023-04-04 09:49:32 +01:00
Henri215
5f68e7835c Garment bag for the chaplain/warden/detective/iaa (#20515)
* Garment bag for the chaplain

* garment for detective and warden

* legal closet removal and garment bag for iaa
2023-03-27 20:41:37 +02:00
Henri215
17a8b219c8 Adds new sounds when sweeping and mopping (#20550)
* Its mopping time

* GDN suggestion
2023-03-26 12:18:34 +01:00
S34N
5ce5a66c81 Ports a load of Pigeonverde322 sprites from beestation (#20588)
* initial

* second

* MORE

* spelling

* more spelling, rods

* qwik mafs
2023-03-26 12:11:01 +01:00
JimKil3
845c842f14 Renames Strange Reagent to Lazarus Reagent (#20614)
* the great renamining
also changes the description to be more flavorful

* capitalization
2023-03-26 12:04:02 +01:00
Henri215
c596e415de You can now sweep into janicarts trash bags (#20629)
* You can now sweep into janicarts trash bags

* farie review

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-25 13:38:49 +01:00
Burzah
996756dd01 Smuggler's satchel now fits in Bag of Holding (#20630)
* adds an override to storage_base.dm
allows for BOH to hold smugglers satchel

* formatting fix

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* small tweak after testing

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-03-25 08:07:33 +01:00
Samman166
5db00d7095 Stun batons and Stun prods that are turned on cannot be stored (#20303)
* active batons and stunprods cannot be stored

* now checks if baton was turned off by removing its cell or running out of charge

* won't fit in bags of holding now

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

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

* Reworked to not use weight class but instead can_store and mob_can_equip

* removed W_class_on var that I added, it's redundandt now that this does not use weight class

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Apply suggestions from code review

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

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

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

* disable_warning = TRUE

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-24 21:45:22 +01:00
Octus
a19e2cc4ef Freedom Implant is now 5 TC instead of 6 TC (#20425)
* ITS TOO EZ

* CMON MAN ITS TOO EZ
2023-03-23 11:38:17 +00:00
Henri215
5c9d20f65f Ports the Bluespace Light Replacer from BeeStation (#20545)
* Ports the Bluespace Light Replacer from BeeStation

* advanced replacer for janitor ERT

* wrong place

* Preventing it from being used over cameras

* Update code/game/objects/items/devices/lightreplacer.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* bluespace replacer only for gamma

---------

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2023-03-22 22:22:19 -05:00
Coolrune206
48eb386e5c Donk Pocket Cooling 2: The Reworkening (#20453)
* donk pocket rework

* Snowball had a far more sensible way to do this

* lewcc review

* Sirryan review

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

* I fix?

* Revert "I fix?"

This reverts commit 1517d2e21e.

* please work you stupid .dmi

* WORK DAMN YOU

* will this hypothetically work

* re-adds syndie donk kit

* documented these

* just return

* clause guarded

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-20 14:26:06 -05:00
GDN
5557f6ae32 Nukes detailed examine (#20314)
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

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

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/power/apc/apc.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Update code/modules/projectiles/guns/energy/nuclear.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2023-03-17 16:20:53 -05:00
GDN
19c4c00503 deletes some unused variables (#20609) 2023-03-13 18:32:36 -04:00
Burzah
30e461f60a Ert medic kit rework (#20561)
* First commit for ERT medic kit rework

* Value adjustment for pill bottles and patch pack
This was intended for the first commit

* removes the empty containers previously created

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

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

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

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

* Merge conflict resolution

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-03-13 22:53:47 +01:00
GDN
850acd85b3 improved admin logging for chembombs (#20498)
* improved admin logging for chembombs

* Update code/game/objects/items/weapons/grenades/chem_grenade.dm

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

* Update code/game/objects/items/weapons/grenades/chem_grenade.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-03-08 20:16:09 +01:00
GDN
626d2754d5 objective items being destroyed are now logged (#20485)
* objective items being destroyed is now logged

* signal time

* oop

* Update code/modules/projectiles/guns/energy/laser.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* mira review

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 20:15:16 +01:00
GDN
8ea96d8e36 Makes the armblade handle more like the fireaxe with opening doors (#20313)
* armblade tweaks

* mistaken regression

* farie's review

* early return

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2023-03-08 19:57:14 +01:00
GDN
dd47769567 combat defib tweaks, moved out of the medikit (#20379)
* moves the combat defib out of the first aid kit, tweaks both costs

* no more synthflesh patches

* i just a little stupid

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

* we just a little stupid

* deletes stims, really not needed

webedit lol

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-03-06 23:47:00 -05:00
Henri215
77b554b73e Deluxe soap for ERT (#20346)
* Elite soap for the best

* Reverting janiborg soap
2023-03-04 09:39:18 +01:00
Christasmurf
330180c83e Dignitary drip - Magistrate, NT Rep, Blueshield (#20438)
* dignitary, human, items, spawning

* garment bag update

* dignitary icons

* ntrep cap

* gloves and hat fix

* dignitary icons part 2 and misc code

* minor stuff

* hat fix from updates also drask and grey suit slot

* minor description discrepancy

* cane resprite
2023-03-02 09:15:35 +00:00
Luc
90fbfb8d0c Fix shock sounds (#20457) 2023-02-27 11:01:32 -06:00
Henri215
e081a9976a Adds five new bible sprites (#20416)
* Fours new bibles and lib computer emag_act

* inhand sprites and moving bibles to new dmi file

* Clockwork bible

* Missing pixel from clock_bible
2023-02-27 10:52:07 -06:00
GDN
8eccdfcb19 fixes a highlander runtime and the highland MA not being assigned (#20409) 2023-02-27 10:34:13 -06:00
Henri215
1ce593b9a2 Ports TG push broom (#20367)
* Ports TG push broom

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

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

* Apply suggestions from code review

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

* Lewc review and twohanded autodoc

* Steelslayer review

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 12:15:21 -06:00
HMBGERDO
e491aa9c2e Fiber Garrote now mutes all emotes when garroting target (#20393)
* added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent

* Revert "added check for STATUS_EFFECT_SILENCED when we want to emit emote sound. If /mob/living has this flag, emote wont emit sound. Less ways to spam sounds when you supposed to be silent"

This reverts commit bc093ba01f.

* new status effect absolute silence, applying when using fiber garrote to silence all emote sounds

* comments update, status set function standartisation

* Update code/datums/emote.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-02-25 01:12:56 -06:00
Henri215
f0bf051e4b Janitorial holosign projector tweaks (#20368) 2023-02-25 00:14:19 -06:00
BiancaWilkson
ceed4e89f9 Reworks the poison pen (#20353)
* paperwork so boring it kills you

* it's worth a bit more now

* Backup in case you poison yourself

* Virologist gets it, accurate description

* I promise im literate

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

* No more charcoal, time for gloves

* Turns comments into auto-doc

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-02-25 00:08:40 -06:00