Commit Graph

10081 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
Venuska1117
b3a5fd773c Fixes (Oversight?) with fungus spawner from #16877 (#21057)
* Changed Fungus
- Now fungus dont spawn wall if roll fails.

* Apply suggestions from code review

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-05-22 22:06:30 +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
JimKil3
dd3a23de7d Adds four new departmental tools (#20822)
* engineering crowbar

* engineering crowbar map changes

* command multitool description overhaul

* command multitool inhands

* security wirecutters

* security wirecutters map changes

* science welder

* crowbar weight class

* science welder suicide act

* welder map edits

* oagh
fixes "the the research welding tool" in its suicide act

* cargo screwdriver

* immobilize > stun

* cargo screwdriver mapping in

* sirryan review

* lewcc review

* oops

* comment clarification

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

* forgor 💀
I forgot to stage the changes to this file before the last commit

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-05-14 18:00:23 -05:00
Ryan
1f08b497e7 Reduces Cargo Export Revenue for Plastic Crates (#20988)
* adds value variable to crates

* fixing an initial value for crate count definition

* Update code/modules/shuttle/supply.dm

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

* removed unused SSeconomy var

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-05-14 00:24:14 +02:00
S34N
04377481a2 Holding a plant pot hides mob HUD (#20868)
* hide plant pot

* different method

* GC

* what am I even doing
2023-05-14 00:23:44 +02:00
Luc
b0567b2778 Fixes superslaps (#21011) 2023-05-11 13:51:44 -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
GDN
910d07561e outta the closet (#21039) 2023-05-08 16:34:54 -05:00
GDN
12c154532e plastic crates no longer drop metal (#20984) 2023-05-02 18:28:04 -04: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
McRamon
3dbb2726ed Autopsy scanner resprite (#20957)
* moved icon

* code too

* sprite

* inhands
2023-04-27 18:37:36 +01:00
Silverplate
19af733ad2 Medical stacks (#20824)
* Fixes gauze upgrading

* Fixes accidental line removal

* Unessassary boolean

* shortens code, adds flag to /stack/medical

* Clarity and proper inhertance
2023-04-25 16:00:37 -05:00
Contrabang
b3cf5f88d9 fixes emp flash runtime (#20923) 2023-04-25 21:14:46 +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
QuacksQ
df6d8dc0fa Airlocks now smooth with walls and windows. (#20795)
* Airlocks now smooth with walls and windows.

* False wall smoothing

* Update false_walls.dm
2023-04-25 21:13:14 +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
Silverplate
1e3d1dc6d6 Makes Nitrous Oxide Visible on Air Alarm, PDA, and Analyzer (#20891)
* Makes N2O not a trace gas

* Back end for nitrous readout on air alarm

* Makes nitrous appear on atmosphere scanners

* adds N2O bar to air alarm UI

* adds nitrous to PDA scanner

* TGUI Rebuild
2023-04-24 19:34:25 +02:00
McRamon
8a1736a9f4 Resprites top 4 ugliest things on station (#20890)
* floodlight

* pos register

* linebin

* gameboard

* little fix 1

* fix 2

* fix 3

* fix 5

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-04-22 10:32:41 +02:00
McRamon
9b310d84c4 Engineering cart resprite (#20901)
* adjustments

* asfr

* last? sprites

* last of us fix

* pranked

* sprite fix
2023-04-22 09:58:30 +02:00
Henri215
e0b7832927 Fixes spraycan icon not updating properly (#20897) 2023-04-22 09:58:15 +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
Contrabang
b47f22ffb9 Fixes a runtime with cyborg stacks being initialized with no power source (#20848)
* begone runtime

* refactor
2023-04-22 09:43:51 +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
Sean Dandrea
07987bd393 Allows click-dragging onto meat spikes (#20723)
* Allows click-dragging onto meat spikes

* use constant SECONDS for readability

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

* Styling - not spaces around equals sign

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

* src is implied, removing it

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

* Use Adjacent instead of get_dist

* Remove buckle override

---------

Co-authored-by: Sean Dandrea <SeanOfAndrea@outlook.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-22 09:17:25 +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
S34N
8d8f488f2d fixes this (#20745) 2023-04-16 22:13:35 +02:00
S34N
d5e66024c7 Resprites hand labeller and big red button (#20744)
* sprites

* timing

* Apply suggestions from code review

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-04-16 22:12:37 +02:00
BiancaWilkson
5751f6e1ff Adds parrying to CQC (#20634)
* heh, almost made me use ten percent of my power

* appeasing the GC gods (GDN)

* hee hoo

* Update code/modules/martial_arts/cqc.dm

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

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

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

* more return styling

* Update code/modules/martial_arts/cqc.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

* no more wrapper

* the extent of my spriting skills

* fixes double slap sound

* slap emote also works

* try to remember the advanced lessons of CQC

* i hope this fixes the merge conflict

* Chefs are no longer perma-combat trained

* Chef CQC now uses signals to activate parrying

* Makes it easier to add it to other martial arts

* resolving merge conflict from ParadiseSS13#20620

* Revert "resolving merge conflict from ParadiseSS13#20620"

This reverts commit 30ea29a6a8.

* Revert "try to remember the advanced lessons of CQC"

This reverts commit e8daeb4d1a.

* try to not conflict the basics of CQC

* Update code/modules/martial_arts/cqc.dm

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

* Update code/modules/martial_arts/cqc.dm

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

* lol, lmao even

* GDN was right, this is funny

* Update code/modules/martial_arts/cqc.dm

farie review pt. 1

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

* Update code/modules/martial_arts/martial.dm

farie review pt. 2

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

* Update code/modules/mob/living/carbon/human/human_emote.dm

farie review pt. 3

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2023-04-15 22:18:18 +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
Charlie
e6085895c1 burn wounds, for real this time (#20542)
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
2023-04-14 15:58:38 +02: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
unknownuser782
960d9e3ce0 Fixes t-ray scanners and map editing (#20725)
* t-ray scanner fix

* fix map editing

* autodoc stuff

* don't hide vents and things

* misc layer fixes
2023-04-08 08:14:34 +02:00
Luc
495f5c423b Fixes a closet bug (#20819) 2023-04-05 20:39:05 +02:00
JimKil3
bbbbc52cd6 Adds the command multitool (#20610)
* adds the device

* map edits

* suicide act

* oops
fixes duplication issue

* sean review

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

* Update code/game/objects/items/tools/multitool.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-04-04 16:13:35 +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
S34N
c8418fa1b2 sinew (#20718) 2023-03-26 13:59:53 +01:00