cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-07 08:02:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,627 Commits 26 Branches 2 Tags
aad8529c24eda3d68016d08136ca7e33d9cdbe73
Commit Graph

10235 Commits

Author SHA1 Message Date
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
DGamerL
eedb4013c7 SILVEEEER (#22003) 2023-08-16 20:58:25 +01:00
Henri215
9836cf3196 The butler polling text for ghosts is now correct (#21992) 2023-08-16 20:46:59 +01:00
Contrabang
07fc90503b bam (#21979) 2023-08-16 20:46:11 +01:00
Burzah
b4e5e3f505 Radio Jammer can no longer jam across z-levels (#21954) 
* jammer fix attempt

* oversight fix
 2023-08-16 20:44:14 +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
matttheficus
7a7d3d8226 Gives the Bartender/Chef the Ability to Jump onto Tables Faster (#21885) 
* and i saaaaid JUMP (JUMP!)

* logic moment + chef

* lewcc + contra reviews
 2023-08-16 20:25:05 +01:00
DGamerL
f3267d4325 Adds an orderable random plushies crate for 1000 credits (#21878) 
* ok one second I gotta do something else

* Okay we ball

* Okay we are stealthier now

* Does this work? I have no idea.

* So cloooose

* I don't know what the fuck I am doing

* IT WOOOOOOORKS

* Contra reviews

* oops

* Contra review

* Now it actually works
 2023-08-16 20:20:58 +01:00
Aylong
ceea2c54e5 tweak: Better stacks (#21861) 
* tweak: Better stacks

* review changes

* del return

* that's it
 2023-08-16 20:11:39 +01:00
Luc
2d80c8ec69 Prevents radios from working in certain admin areas (#21847) 
* Add blacklisted areas for tcomms cores

* Blacklists some areas from tcomm cores

* this is better

* Update code/game/machinery/tcomms/tcomms_core.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-08-16 20:06:02 +01:00
Venuska1117
3db565f553 Add Railings "Caps" for Aesthetic Use. (#21803) 
* Add railing caps
-subtype of railing corners

* Batch of changes:
- Fixed cap sprite
- Added 2 more instances of caps (left and right)
- Added caps to rods crafting menu
- Changed cost of corner from 3 to 2
- Added cost to cap, it cost 2 rods

* Woops:
- Apparently railings corners and such borrow code from normal railing so they always drop 3 rods.

* Change railings to list

* removed density/climbable
- they inhert it from railing
 2023-08-16 19:58:57 +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
DGamerL
c2f9228988 [s] Fixes several clingspider related runtimes and fixes spiderlings growing into infestation spiders (#21988) 
* The fixes

* Steelslayer review
 2023-08-14 20:52:15 -05:00
benjicoots
cc13c52fed Make air alarms start with the correct default state when placing the… (#21635) 
* Make air alarms start with the correct default state when placing the frame

* Update code/game/objects/items/mountable_frames/air_alarm_frame.dm

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

* undefs to allow CI passing

* define moment

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-12 19:27:42 +01:00
GDN
a4010a9525 buffs the mind batterer (#21758) 2023-08-12 18:54:19 +01:00
Qwertytoforty
7907e1dc38 Only malf AI can hack doors with cut ai wires, flash emps cameras (#21610) 
* Only malf AI can hack doors with cut ai wires, flash emp

* weaker emp = less time

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Apply suggestions from code review

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

* FLASH. AH AH

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2023-08-12 18:43:05 +01:00
Qwertytoforty
823ca7570a cryo vetus slip nerf (#21865) 2023-08-12 18:24:50 +01:00
warriorstar-orion
124f222ec0 feat: clicking on wallmaps prompts to open webmap (#21840) 2023-08-12 18:23:38 +01:00
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
Divulf
be0cd179d3 Adds 5 mannitol pills to the psychiatrist's pill bottle (#21557) 2023-08-11 15:36:53 +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
Henri215
32132e4274 Hooking someone on a meat spike is now logged (#21857) 
* Hooking someone on a meat spike is now logged

* Could use this? idk

* Checking for client

* mind is better

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

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-07-29 17:09:19 -05: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
DGamerL
083262dbd9 Morgue trays now can't move while in no gravity (#21777) 
* fixxx

* this is an oldcoder moment

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-07-27 15:57:13 +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
Bjamcham
c874e8d1d9 The automatic Cryo storage Portal will no longer spark on use (#21739) 
* New cryo portal subtype

* A better way to do it

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

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-07-24 15:45:58 +01:00
GDN
0e0c726a5b If you get facehugged and nested, you are now able to ghost (#21717) 
* If you get facehugged and nested, you are now able to ghost

* more shit

* zamn

* Revert "zamn"

This reverts commit b864798b2f.
 2023-07-24 15:44:20 +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
matttheficus
eeca206ccf Removes Green Giant Spider from Gold Slime Cores (#21615) 
* begone dchat and admin spam

* sirryan review
 2023-07-24 15:16:00 +01:00
JimKil3
bcea9d3377 Cryogenic anomalies & armor (#21603) 
* cryogenic anomaly

* sprite

* reactive gelidic armor

* america number 1 raaah

* sprite (thanks atp)

* qwerty suggestion

* floor freezing

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

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

* steel review commit 2

* whitespace apparently? idk

* whitespace fix (real)

* vetus

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

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

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

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

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

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

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

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

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

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* early return thing

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@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-24 15:11:21 +01:00
Qwertytoforty
f58219a6f0 Makes anomalies deadlier. Again. (#21525) 
* Makes anomalies deadlier. Again.

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

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>

---------

Co-authored-by: JimKil3 <47290811+JimKil3@users.noreply.github.com>
 2023-07-24 15:03:17 +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
GDN
df3b44e6ab kills off last_bumped, jank reduction (#21696) 2023-07-23 23:32:11 +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