Commit Graph

4234 Commits

Author SHA1 Message Date
PopGamer46
50443325bf Adds Twimsts, a snack that can be used as eatable handcuffs (#22092)
* adds twimsts, the eatable handcuffs

* fixes twimsts cuffs showing up as cable on examine

* missing ending newline fix

* spelling

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

* list formating or something

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

* removes unnecessary bit of description, why did i put that there?

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

* 0 to FALSE

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

* path fix

* removes note showing wrong intent of adding code

* removes unnecessary examine

* code shortening, optimization, something?

* fix

* proper proc

* oops

* better sprites

* trash sprite not eaten?

* even better sprites

* removes extra empty line of code

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* fixes improper code formatting or something

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-07 10:39:29 +01:00
DGamerL
702893d02b Deletes the space worm (#22251)
* But every brave man wants to be wealthy

* even though it would mean losing thisgreattreasure
2023-09-06 22:19:58 +01:00
Adrer
40f5493b1e Changes clamp to use max_matter instead of magic number (#22195)
Co-authored-by: Adrer <adrermail@gmail.com>
2023-09-06 19:08:50 +02:00
Contrabang
65ab4a5d89 Refactors station areas to be /area/station subtypes (#21681)
* areas

* progress...

* death hatred and murder

* get current master maps

* hoooly shit i can load up the maps

* it compiles now

* map changes

* fixes some unintended stuff

* make the .dme right

* fix mixed space+tab indents

* more space-tab fixes

* CI, please show me more than 1 CI fail at a time

* UPDATE PATHS!!!

* none of the stations had it anyways, but fixed

* mint wasnt actually deleted, my bad

* epic random CI fail for no reason

* i beg you, CI

* dont delete anything

* okay THAT should work now

* okay get master maps and rerun

* okay THEN run update paths

* actually done now

* oops
2023-09-06 17:37:50 +01:00
TaM-tHe-JaM
e07d63702c Islamic Garb - My First Contribution (#22040)
* abayacontribute

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* Update code/modules/clothing/suits/misc_suits.dm

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

* adding a slash

* Update code/modules/clothing/suits/hood.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* NVM didnt get deleted, didnt transfer

* tab fix

* removed comma

* Deleted unnecessary list, thanks DGamerL

* deleted

* finallymergeconflictgone

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:33:44 +01:00
GDN
08eb183875 Gives the bartender their own version of judo (#21886) 2023-09-01 23:20:47 +01:00
Marm
7336750e48 Paramedic QOL - Lavaland Edition (#22154)
* paramedic grindset

Adds Paramedic headset with associated encryption key. Gives Paramedic mining access+supply comms. Adds Lavaland corpse related recovery equipment to Paramedic locker.

* goodbye soul hello garment bags

Adds a Paramedic garment bag. Cuts back on Paramedic locker clutter by adding crew monitor and crew pinpointer to loadout.

* headset, i barely know her

Paramedic headset moved out of garment bag and into main locker.

* lore???

Turns out I've been spelling Nanotrasen wrong all this time.

* Update code/game/objects/items/devices/radio/headset.dm

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>

---------

Co-authored-by: matttheficus <57759731+matttheficus@users.noreply.github.com>
2023-09-01 23:19:41 +01:00
Burzah
67901058ae Unum! The card game. (#22152)
* UNUM!

* distributing unum

* merch vendor

* Apply suggestions from code review

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

* color

* dmi update

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-09-01 23:18:37 +01:00
Silverplate
622dc36357 Updates the Supermatter Engine Book to act as a pocket guide for SM events (#22072)
* SM book updated (it only took like 5 years)

* Grammar police reviews

* Updates book to reflex hotfix
2023-09-01 23:13:04 +01:00
HMBGERDO
6d890ca3e6 No more accidental put baton on table/in backpack (#21946)
* fixing putting baton on the table by accident

* storage items support

* storage item check tweak
2023-09-01 23:01:12 +01:00
Henri215
e5ca69bd06 Ports some sounds for toolbox/briefcase/switch (#21938) 2023-09-01 23:00:36 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619)
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2023-09-01 22:06:59 +01:00
GDN
6bf9bb963d readds baton throwing (#21481)
* readds baton throwing

* forgot this

* judo

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

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

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

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-31 17:54:07 +02:00
Contrabang
e754819607 Merges LAZYDISTINCTADD and LAZYADDOR (#22138)
* kills off LAZYDISTINCTADD

* Changes it to Distinct Add...
2023-08-28 15:44:56 +01:00
DGamerL
0c0cf63608 I love afterattacks (#22028) 2023-08-23 21:12:43 -05:00
HMBGERDO
979935a7c9 Fixed Trick Revolver, Added Trick minibomb (#21915)
* trick revolver fix, trick minibomb added

* Update code/datums/uplink_items/uplink_traitor.dm

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

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

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

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

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

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2023-08-21 19:56:33 +01:00
Burzah
50bc2a2366 advtooluser dex messages (#21996) 2023-08-20 21:16:30 -05:00
matttheficus
597835b031 The TC Inflation Act of 2023 - No Balance Changes This Time (#22024)
* its time for me to make Hal cry again

* hal review
2023-08-21 00:20:47 +01:00
Qwertytoforty
76a845d380 Modsuits. Ready for review, sorry for the ammount of files changed 👉 👈 (#21147)
* biting off more than I can chew, but I feel like hurting myself

* more shit

* progress continues, moral stays sameish

* bite of 2587

* mod_theme down, but probably broken

* 385 errors, 16 warnings, zero tgui interactions

* 292 19

* final strech to buggy mess, break time

* it compiles. It almost fucking certainly doesnt work, but it compiles

* fudhsciffubgsbgpgb actions not working as should for modules

* fuck it we'll just open the pr as we work on it

* icons work now

* tgui stuff

* more progress

* JUDGEMENT

* IT LIVES. TGUI LIVES. Special thanks to Sirryan and my brother.

* jetpacks, gps, and go do what exo-suits yourself

* almost ready

* sorry to whoever has to review this

* should work™️

* should be good now

* pushing changes so I can do reviews next

* Apply suggestions from code review

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

* lore™️ Adds illegals level to modsuit parts from syndicate.

* early returns

* and these illegals

* no uplink reference idiot

* mod inhands are a good idea

* this is needed for inhands nerd

* Bomb detector working, modsutis cover ears. skin things

* overslotting removal, cyborg charging, ert loadout for gamma

* duplicated signal

* modsuit themes, removes broken mister / bad base type module, 2 cores in robotics.

* tether module, orb module, holster stuff

* built in no slip, cheaper 87

* removes modules already installed, engineer ert get jetpack, equip into modsuit storage

* comments spaces and duplicate flags

* Some adjustments and thoughts on armor, heads get guns because they are cool like that / looting command members armor

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Compile TGUI, slowdown adjustment, Modsuit to MODsuit

* sonar, do after, more equipment, acid handling

* overlay bugs / ERT / DS suits autodeploy

* middle click action buttons

* traders, sec modsuit energy nerf

* surplus weighting

* Kinesis module.

* Pathfinder module, kinesis balance, blueprint for pathfinder and kinesis

* more power / unused module removed

* name, ds fix, pre equipped to cc suit

* depot / grammer

* ok should be good™️

* overslot, dupe gun, missing suit storage

* stealth nerf, new kit

* gun stuff  / ds theme

* bio armor is gone

* let me push changes please thank you

* makes shocks work right

* copies over some changes TG made to module prices after porting

* Merge remote-tracking branch 'upstream/master' into Because-I-hate-myself-and-someone-has-to-try-it-

* sirryans changes

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

* Update code/modules/telesci/gps.dm

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

* Update code/modules/telesci/gps.dm

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

* Control define, ERT / DS have gloves / boots again.

* Apply suggestions from code review

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

* More changes

* god I hate tgui. Why do all the bundles live underground, instead of in my basement?

* she updates my master till I testmerge

* modsuits can recharge again

* fixes a lot of shit

* Ready for TM probably

* sure fuck it whatever that makes sense I guess

* the pinpointer works better™️

* Another storage module bug fix

* hair and medical stuff

* fuck fuck fuck

* fixes sonar

* Bag exploit fixes / plasma runtimes / ear nerf

* dna lock improvement / cryostorage

* whoops

* Ball form second cooldown wasn't helping, no more infinite cores

* she springs my lock till I ***SNAP***

* plasmaman no longer die

* fixes modsuit emp issues

* atmos no longer fucking dies

* Fixes, module printing, and a restriction on newly constructed modsuits

* Inventory code my hated

* WOOO PREFERENCE CODE WOOOOO

* icons my hated

* fix for mods / spaceproof shit

* holy shit whhhyyyyy

* backpack first

* Update mod_theme.dm

* prevent infinite gun arms / infinite modsuit cores / syndicate modules

* fixes tm error

* scream loudly if species sprites break. They shouldn't, but, you know.

* deconflicted with luck

* converts to refit for species

* fix pathfinder

* fixes modsuits being funky power wise

* lockboxes :gatto: , as well as DN-MP shield lock, and slight nerf to atmos modsuit

* nerfs the atmos modsuit

* magboots for ds / CC modsuit

* downside of autosave: typing in wrong window saves bad stuff

* Gamma ERT have internal cameras again.

* spellcheck when

* ah fuck

* yes delete the null that works

* whoops

* fixes error / description

* un vulps your cannon

* fixes tails disapeering on base modsuits

* space to underscore

* tgui fix / tajaran

* springlock buff, cryopod fix

* u helps

* WHO PUTS A GUN IN ITEMS

* tgui moment

* mining modsuit nerf / hidden holster module

* PAIN

* UNATHI TIDE STATION WIDE

* I love special code

* slightly dense

* shark jumpscare

* fixes ghost item, fixes springlock being bad

* YIPPEEEE IT WORKED

* she decons my flict

* pain

* ebbas days are numbered :^)

* hidden

* r-r-r-ebuild

* fixes more bugs

* qwerty, you are dense

* fixes gps

* fix mulebot crate

* level fix

* adds back icon

* moving storage, fix bug, modules activate / deactivate message

* yeah

* yeah

* yeah™️

* steels requests

* windoors no longer make pathfinder module explode

* chat spam

* oil slicks + modsuits

* whoops

* bag check

* ofc

* Update code/modules/mod/mod_control.dm

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

* Apply suggestions from code review

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

* Update code/datums/uplink_items/uplink_nuclear.dm

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

* Update code/modules/mod/mod_control.dm

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

* Update code/modules/mod/modules/module_pathfinder.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@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: S34N <12197162+S34NW@users.noreply.github.com>
2023-08-19 15:36:13 -05:00
Qwertytoforty
aad8529c24 Removes swiftness, add speed potions back as oil slick potions (#20939)
* Removes swiftness, add speed potions back as oil potions

* no shorting, icon update on mob

* early and forgotten returns

* ramon oil colours

* Update code/modules/research/xenobiology/xenobiology.dm

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

* no more slipery vehicles, now slippery tables

* just because it compiled the first time doesn't mean the second list will compile idiot

* icons my hated

* bottle4

* cleaner up

* qwerty my man what you doin: s34n 2023

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 21:07:39 +01:00
Henri215
9836cf3196 The butler polling text for ghosts is now correct (#21992) 2023-08-16 20:46:59 +01:00
1080pCat
d1d0effa0a Empty trashbags can now fit inside backpacks. (#21888)
* i think this is workin

* sillly me

* also this guh
2023-08-16 20:31:04 +01:00
Silverplate
ff909adfb1 Adds Species Unique Traitor Gear (ready for review edition) (#21313)
* Vars and ideas

* Adds supercharge implant

* species specific tot gear!

* Adds vox spikethrower

* Adds Love injecting pen (skrell)

* sprite issue fix

* typographical error.

* makes pen not refillable, pacifies

* Adds fireproofing nanite injector (plasmaman)

* Lower KD on spikethrower per qwerty

* Lewcc review

* aaaa so much space indentation

* steelslayer review

* Steelslayer review

* Lewcc reviews

* Changes the spans

* Lewc review, Thanks to DG for doing my PR for me.

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

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

* Henri review

* Forgot this one

* Whoopsie number 2

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-08-16 19:25:25 +01:00
Burzah
4150373d43 Reworks Bear Traps (#21941)
* beartrap trigger on find

* fixed an oversight

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* 2 second timer for arming a trap

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* adjust breakout time

* apply extra damage if bear

* 15% to delimb on opening bag

* reverts delimb

* first set of review changes

* small adjustment

* spring_trap proc work

* spring_trap first pass

* spring_trap take two

* code formatting and simple mob damage

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

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

* review fixes

* Apply suggestions from code review

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

* a little code cleaing for review

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

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

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

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2023-08-15 14:51:54 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
Henri215
bcb5440906 Fixes a thing (#21912) 2023-08-03 23:14:37 -05:00
Silverplate
9186b7d421 Adds Corporate Judo, an optional alternative to the stun baton (deconflicted edition) (#21229)
* Adds Judo, Judo belt, and increased harm damage

* Judo users can no longer use batons (any type)

* Adds Discombobulate combo

* adds Eye-poke combo

* copy-paste related error fixes

* adds throw (knockdown) combo

* adds Armbar and Fatailty Combos

* assorted changes (spelling, args, unneeded checks)

* minor changes to belt item

* updated desc, fixes belt item pathing

* adds 3 belts to secvend

* Adds sprites courtsey AVeryReulctantSpider

* Assorted code cleanup (thx Henri)

* minor grammatical issues

* Adds Judo, Judo belt, and increased harm damage

* Judo users can no longer use batons (any type)

* Adds Discombobulate combo

* adds Eye-poke combo

* copy-paste related error fixes

* adds throw (knockdown) combo

* adds Armbar and Fatailty Combos

* assorted changes (spelling, args, unneeded checks)

* minor changes to belt item

* updated desc, fixes belt item pathing

* adds 3 belts to secvend

* Adds sprites courtsey AVeryReulctantSpider

* Assorted code cleanup (thx Henri)

* minor grammatical issues

* junk commit to re-open PR

* pronoun consistancy

* Lewc review #1

* de-jankification, buffs eye poke

* Reduces harm intent damage from 10 to 7

* descriptions

* lewc name change

* weight class is now bulky

* wheel throw fix, discombob buff (slight)

* Throw buff (Grab > disarm)

* partial lewcc review

* assorted reviews (HIIYAA edition)

* Eyepoke, discombobulate can be done on the ground

* hal second pass review

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2023-07-30 18:08:16 +01:00
Badoniondev
9dc983d026 fixed the sound. (#21842) 2023-07-29 12:40:44 -05:00
GDN
067ce5670e removes uses of << sound, replaces with send_sound (#21774)
* removes uses of << sound, replaces with send_sound

* readds sound wrappers
2023-07-27 15:57:04 +01:00
HMBGERDO
d7f55f1122 garrote can now be used from any angle on incapacitated (#21830) 2023-07-27 15:54:38 +01:00
DGamerL
1d4f3187ee Fixes agent IDs not working when you are put into a different body (#21784)
* needs testing

* okay this works

* pinpointer fix

* Steelslayer review

* my bad, sorry
2023-07-25 22:14:55 -05:00
matttheficus
15c5acd05c Adds the Prototype Freedom Implant (#21759)
* FREEEEEEEEEEEEEEEEEEEEDOM

* stop showing everyone i copy paste my code smh
2023-07-24 15:53:54 +01:00
matttheficus
f48693ef4c Adds Fragmentation Grenades to the Uplink (#21726)
* boom boom pow

* ctrl + c / ctrl + v is bad
2023-07-24 15:42:11 +01:00
SteelSlayer
b1beace4ea stealth implant cooldown balancing (#21713) 2023-07-24 15:36:56 +01:00
Contrabang
2e7c83866c Fixes headrevs being able to be mindshielded (#21714)
* VIVAAAAA

* sirryan review
2023-07-24 15:36:42 +01:00
larentoun
1f61451c98 fix: Storage shuffling sound now works for mousedrops (#21662)
https://github.com/ss220-space/Paradise/pull/1357
2023-07-23 23:30:50 +01:00
Contrabang
01889aae10 Buffs the Camera bug by adding hidden cameras (#21618)
* LETS GOOOOOo

* desc

* steel review

* ASYNC MAGIC!

* lewcc review

* i cant spell

* async
2023-07-23 23:28:56 +01:00
JimKil3
86874ce415 Adds the titanium push broom, a janitor-exclusive traitor item (#21496)
* adds it

* fixes the thing

* !! scope size increasing !!

* trait rename

* surplus removing

* Apply suggestions from code review

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

* code review commit 2

* fixes a minor issue

* check_grep please have mercy

* Apply suggestions from code review

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-23 23:28:24 +01:00
Octus
912d444d07 Removes Vox... Armalis, yes the other vox we forgot about (#21519)
* youtube 2008 die sound effect

* I take pride in my work

* noisecannonsbegone

* armalis clothing shit
2023-07-23 20:14:27 +01:00
Sadhorizon
855a88a548 drip (#21624) 2023-07-17 15:37:38 +01:00
larentoun
a53796ef1d feat: BRPED tier4 for debugging (#21655) 2023-07-17 11:04:00 +01:00
larentoun
297e268b15 [FEAT] Battlemage Bundle now contains wizard magboots! (#21671)
* feat: Battlemage Bundle now contains wizard magboots!
https://github.com/ss220-space/Paradise/pull/1061

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
2023-07-17 10:57:00 +01:00
Badoniondev
5e0e175a39 Refactors inventory items code to allow to play custom sounds, adds custom sounds to pill bottles and patch packs (#21634)
* Removed dupe playsound, sound now uses var

* pill bottles now have sounds

* Patch packs also have sounds

* Increased patch packs volume by 4db

* Moved sounds to folder, added licence and credits.

* Fixed invalid sound paths
2023-07-17 10:54:57 +01:00
SteelSlayer
0786ecaf5c stealth implant boxes don't drop cardboard (#21706) 2023-07-17 10:49:11 +01:00
Nathan Winters
40927ac3eb Fix some defib bugs (#21353)
* Slightly clean up `undergoing_cardiac_arrest`

* Fix runtime when defibbing a heartless slimeperson

* Slightly clean up `defibrillate`

* Deduplicate this

* Yeet this unused signal

* Yeet these unused return flags

* Minor cleanup

* More cleanup and readability; fix defibs reporting outdated brain damage

* Fix defibrillators healing brain damage

* Fix defib brain damage scaling the wrong way (who the fuck)

* Fix this macro expansion bug (I'm going to become the joker)
2023-07-15 14:52:04 -05:00
Qwertytoforty
995571183f Toy dualswords no longer fucking kill the crew when thrown into, clowns no longer die to toy dsword. (#21620) 2023-07-10 10:04:00 -05:00
Fridge Burns
a19e2fb130 fix the bat (#21617)
Add RANDOM_BLOCKER flag so the bat will deflect stuff
2023-07-10 11:10:53 +01:00
Contrabang
7fb0e7157a exploit gone (#21605) 2023-07-09 10:47:13 +01:00
HMBGERDO
62a2c82eab Hand tele tweaks (#21224)
* hand tele tweaks

* i need to sleep

* updated portal description, removed hand tele ability to remove portals

* added disabled icon state, removed dual portals

* syndi teleporter stages + icons

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

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

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

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

* Update code/game/objects/effects/portals.dm

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

* resolving conflict

* no more races

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2023-07-07 13:57:56 +01:00
GDN
11e7d641e8 fixes mining armblades being unable to be picked up after being dropped (#21333)
* fixes mining armblades being unable to be picked up after being dropped

* Oh yeah right
2023-07-07 13:55:38 +01:00