cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 00:41:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,562 Commits 29 Branches 2 Tags
b1eda77f01bc09b949348ea0c1d60a02bfd969e1
Commit Graph

6513 Commits

Author SHA1 Message Date
Contrabang
b1eda77f01 Adds happiness (a new chemical) (#21718) 
* Adds happiness

* epic linter fail

* epic comma fail

* fuck i forgot to change the name

* deconflict it PROPERLY

* jimkil review
 2023-08-12 18:22:18 +01:00
DGamerL
0264614ab1 Halves the time needed to hack a door with the access tuner (#21895) 
* halves speed

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

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2023-08-11 14:30:14 +01:00
Henri215
4398e2c003 Fixing common spelling mistakes part 4 (#21945) 2023-08-10 17:27:20 -05:00
1080pCat
7705f3af1f actually updates now yippie (#21932) 2023-08-10 17:04:21 -05:00
Henri215
8eaba9f40f Fixes a floor thing (#21962) 2023-08-10 14:18:53 -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
Contrabang
2143d557bd oh the humanity (#21845) 2023-07-27 20:09:45 +01: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
Divulf
aab87dff3c Allows simple mobs to be scanned by health analyzers. (#21802) 
* Allows simple mobs to be scanned by health analyzers.

* Better math.
 2023-07-27 15:56:06 +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
748bf7b988 slapping silly (#21760) 2023-07-24 15:54:32 +01: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
Sadhorizon
83fb15d9df seccomms (#21721) 2023-07-24 15:41:51 +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
Burzah
d39d96948e Cyborgs and Drones dust when interacting with Supermatter Slivers (#21750) 
* sillycon dusting

* Apply suggestions from code review

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-07-24 15:00:13 +01:00
Bjamcham
00a474f6fe New sliver layer(The right branch edition) (#21744) 2023-07-24 14:56:59 +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
Qwertytoforty
55615f762a You may now stuff grenades in plushies. Adds the shark and abductor plushies from TG, non haunted branch (#21769) 
* *cocks gun* branch's haunted

* branch is still haunted but we hired ghost hunters
 2023-07-21 15:56:00 +01:00
AffectedArc07
8d7e066471 Adds OpenDream as a CI lint (#21099) 
* Initial Commit

* Makes the CI work (maybe)

* Of course CI has a hissy fit

* Actually fixes the codebase

* Oops 1

* Tweaks

* oops
 2023-07-18 20:50:31 -05:00
Sadhorizon
855a88a548 drip (#21624) 2023-07-17 15:37:38 +01:00
AffectedArc07
b3d9164862 Reworks RGB procs (#21474) 
* Reworks RGB procs

* Oops
 2023-07-17 14:59:20 +01:00
GDN
4c1144db1d readds the mind batterer, fully reworked (#21193) 
* readds the mind batterer, fully reworked

* Update code/datums/uplink_items/uplink_general.dm

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

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

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

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

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

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

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

* moer changes

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

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

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

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

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

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

* sean review

---------

Co-authored-by: Henri215 <77684085+Henri215@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-07-17 14:57:25 +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
Contrabang
e70b3abb93 The syndicate balloon now has a special suicide action (#21547) 
* syndiballoon

* now leaves stuff on the floor behind

* lewcc review

* lewc review
 2023-07-17 10:51:28 +01:00
SteelSlayer
0786ecaf5c stealth implant boxes don't drop cardboard (#21706) 2023-07-17 10:49:11 +01:00
Qwertytoforty
809335b3b9 [s] Fixes an inconstancy (#21701) 
* fixes an inconsistency

* Apply suggestions from code review

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-07-16 11:21:10 -05: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
90c2384dd9 Supermatter slivers (cut off from the SM) have a slightly glowy ray effect to them, and soul shards (#21261) 
* she supers my matter till I delam

* incorrect delamination alarm

* now soulstones glow to make them  not get lost

* Helper proc, also fixes supermatter visual bugging out on high mole pressure

* moved
 2023-07-12 20:24:34 +01: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
BiancaWilkson
978f43c5e9 Ear Organ Refactor + Deafness is a status effect (#21405) 
* begone ear_damage

* pt 2

* this time actually begone

* ears no longer passively heal over time

* ears can die

* deafness is now a status effect

* Oh yeah ticks are every two seconds
 2023-07-07 13:54:27 +01:00
Vi3trice
a5ecf3bce5 Catwalk floors for interior use (#21437) 
* That's a start

* We had sounds all this time

* New icons, fix tile interaction with plating.
 2023-07-07 13:50:17 +01:00
Nathan Winters
2683da821c Implements balling (#21441) 
* Implement balling

* docstring
 2023-07-07 13:45:54 +01:00
DGamerL
887a5111df Adds confetti shot (#21462) 
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
 2023-07-07 13:44:55 +01:00
matttheficus
dd9079aa1a Adds Cargo Office Access to JaniKeyring + Fits in JaniBelt (#21471) 
* oopsies

* oops here's another fix
 2023-07-07 13:41:54 +01:00
matttheficus
4317881bcc Adds Hydrocodone to the Syndi Med Duffel (#21472) 
* fix time

* a slight reduction
 2023-07-07 13:41:26 +01:00
Contrabang
e212ca48ed Updates wallets (#21531) 
* wallet update wooo

* didnt want to do that

* undo accidental changes

* i have a problem

* i swear I can type comments well
 2023-07-07 13:26:07 +01:00