cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 07:42:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,079 Commits 26 Branches 2 Tags
82b863cefdabb64cb15e03dd7978006390c0f3be
Commit Graph

26638 Commits

Author SHA1 Message Date
S34N
b589d0df29 gorilla death (#21917) 2023-08-05 13:40:29 -05:00
Burzah
d5a719ac3a pills into patch pack fix (#21908) 2023-08-05 13:37:24 -05:00
Qwertytoforty
8336eecd00 Nerfs suitless spacewalking: Cryoxodone now stuns while healing. (#21556) 
* qwerty remeber you made this and publish this

* removes comment due to testing

* just change tcryo dofus

* Cryox that is ingested will not work as it freezes in your mouth

* hmm yes

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-08-05 14:13:35 +01:00
Charlie
10d55cb1fe fix (#21884) 2023-08-05 01:18:56 -05:00
Adri
ae0abc9282 Adds more admin logging to roburgers (#21883) 
Co-authored-by: Miraviel <Miraviel@users.noreply.github.com>
 2023-08-05 01:17:12 -05:00
Luc
783a3742ce Fixes a spurious runtime (#21880) 2023-08-05 01:14:07 -05:00
DGamerL
f6039f9299 Fixes the exploit (#21911) 2023-08-03 22:46:41 -05:00
matttheficus
bdd8e8a20d Disabler Nerf: Slowdown Tweaks + Shot Reduction (#21499) 
* Update _species.dm

* reduce shots

* dont nerf the u-ion

* sirryan review

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-08-02 11:43:42 +01:00
Henri215
4512215e24 Fixes fancy pen description (#21870) 2023-08-02 11:41:17 +01:00
McRamon
fce54deb01 Pimp my drip (#21527) 
* first changes, lest see bugs

* fix

* minor sprite fixes

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

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

* update

* mhm

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-07-31 19:12:26 +01: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
SteelSlayer
e862b01124 gcqueue verb for debug role (#21862) 2023-07-29 23:16:29 +01:00
Luc
19c2d9c3e3 makes human heartbeats not sound robotic (#21856) 2023-07-29 12:55:22 -05:00
AffectedArc07
7340fb0a65 A healthy addition of debug verbs (#21843) 
* A healthy addition of debug verbs

* Forgot some stuff

* SEANNNNNNNNNNN
 2023-07-29 08:58:22 +01:00
Gatchapod
96eb6278b8 New name for Irish Car Bomb drink (#21781) 
* More friendly Irish references

* Fixing description

* Adding an A

---------

Co-authored-by: Gatchapod <Gatchapod@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-07-27 20:48:31 +01:00
Baredolf
87871b7150 NutrimentPump (#21789) 
* Fixes typo and small desc edit

* Changed item description to be more clear

* Update code/modules/surgery/organs/augments_internal.dm

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

* Grammar correction x2

Removed a comma from both description

* Pump -> Pumps

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

* Pump -> pumps x2

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

* Removed unneeded space -Hal9000

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

---------

Co-authored-by: Baredolf <Baredolf@users.noreply.github.com>
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>
 2023-07-27 20:17:28 +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
GDN
1cc69a7316 makes black terrors and white terrors better (#21814) 
* makes black terrors and white terrors better

* I expect you to die

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/black.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-07-27 15:55:36 +01:00
Sadhorizon
acdeedd178 hydrocoat (#21821) 2023-07-27 15:55:04 +01:00
HMBGERDO
b071d71c36 fix ablative hud not covering hair (#21822) 2023-07-27 15:54:48 +01:00
K3Licia
e6b3c5fba7 New Tajaran Emotes (#21296) 
* Delete human_emote.dm

* Add files via upload

* Add files via upload

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update human_emote.dm

* Update emote_keybinds.dm

* Update human_emote.dm

* Update emote_keybinds.dm

* Update emote_keybinds.dm

* Fixing CL error in emote_keybinds.dm

* once AGAIN fixing cl error
 2023-07-27 15:01:49 +01:00
GDN
668c5a3484 Response teams now show up in the orbit menu (#21574) 
* init changes

* TGUI compiled

* Update code/modules/mob/dead/observer/orbit.dm

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

* compiles again + reviews

* tgui update

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-07-26 21:35:35 +01:00
1080pCat
38c1b55de4 you need to WEAR the glasses to use them! (#21831) 
* you need to WEAR the glasses to use them!

* mmm 1 more like true
 2023-07-26 19:11:33 +02:00
GDN
7f7b13b6fd facehuggers are less janky (#21805) 2023-07-26 11:43:31 +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
Qwertytoforty
23503fd5dc fixes ed209 (#21819) 2023-07-25 16:04:34 +01:00
Contrabang
17a4df5a4c Fixes some issues with command and sec job lists (#21806) 
* oh god oh god

* oops, forgot to remove that

* name changes
 2023-07-24 14:24:09 -05:00
Medster
06b76b6f0b Adds the Assistant's formal uniform to the loadout Menu (#21697) 
* Adds the Assistnat's formal uniform to the loadout
menu, Im finally a coder, time to cry in a corner

* adds punctuation for consitancy
 2023-07-24 15:52:26 +01:00
Charlie
5ccd8241c4 homing projectiles + wizard spell (#21752) 2023-07-24 15:52:17 +01:00
1080pCat
907ee1abd1 Adds the research scanner ability to the sunscanners. (#21742) 
* mm sunscanners fun

* forgot about tech potentials!
 2023-07-24 15:47:36 +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
DGamerL
6b410a5e8c most likely fixes it all (#21778) 2023-07-24 09:42:38 -05:00
Bjamcham
0c4a99d73d It now works (#21724) 2023-07-24 15:42:03 +01:00
Contrabang
f06f209f92 Revolutionaries now have a grace periods from attacks after beating deconversion (#21716) 
* deconversion help

* scuffed?
 2023-07-24 15:38:48 +01:00
Bjamcham
94e25a7fcb Chem Dispensers no longer work while unanchored (#21685) 
* Goodbye mobile dispensers

* Fixes message
 2023-07-24 15:31:07 +01:00
Fridge Burns
bf02bb1cf3 Update the in-hand sprite when a gun is reloaded (#21676) 
* update user hand on reload

* review

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

* use forceMove

---------

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2023-07-24 15:30:06 +01:00
GDN
d907f0610e Clown is slippery and the mime has no footsteps (#21675) 
* Clown is slippery and the mime has no footsteps

* bam
 2023-07-24 15:28:51 +01:00
Qwertytoforty
42bd162122 Buffs revivers, Again. (#21673) 
* Buffs revivers. Again. They will still not be used.

* nah fuck that just go to 2
 2023-07-24 15:27:04 +01:00
larentoun
b2d6c34700 [FIX] Fixes the player eating a deck of cards (#21657) 
* fix: Correct newLoc for deck of cards
https://github.com/ss220-space/Paradise/pull/1284

* changes logic a bit
 2023-07-24 15:26:19 +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
Luc
82e12b79c3 Lets dchat-controlled mobs fire guns (#21572) 
* Lets dchat-controlled mobs fire guns

* Better handling for abstract items, too

* better text handling

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

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-07-24 15:06:02 +01:00
Nathan Winters
67f8814c5a Fixes cyborgs being perfect surgeons (#21749) 
* Fixes borgs being perfect surgeons

* Replace an outdated tip with an actual tip
 2023-07-24 14:59:51 +01:00
BiancaWilkson
f55434752c Fixes an umbrae bug (#21748) 
* got the clamp

* minor underscore error
 2023-07-24 14:59:42 +01:00
larentoun
73451ff40d fix: Missing species now for sure defaults to human (#21708) 2023-07-23 23:32:59 +01:00
Luc
83229034da Significantly reduce volume of disposals machinery when processing a ton of items (#21700) 
* Reduce volume of recycler when consuming a ton of items

* Quiets up the rest of disposals machinery

* Defines, not magic numbers

* 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-07-23 23:32:35 +01:00
Contrabang
1d2f929c90 Keycard Authenticator now has 20 seconds to swipe, but requires 2 different people. (#21682) 
* woo keycards

* wowee
 2023-07-23 23:31:29 +01:00
larentoun
b80c2cf964 fix: Moving breaks being pulled (#21663) 
https://github.com/ss220-space/Paradise/pull/1367
 2023-07-23 23:31:09 +01:00
larentoun
becc10c50d [FIX] Mining Vendor now spits ID on power_off (#21658) 
* fix: Miner Vendor now spits ID on power_off
https://github.com/ss220-space/Paradise/pull/1317

* review fixes

* oops missed that

* Update code/modules/mining/machine_vending.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-07-23 23:29:58 +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