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

29 Commits

Author SHA1 Message Date
HMBGERDO
ecc109915a Stamina damage no longer bypass some checks (#23447) 
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
 2024-02-04 21:15:20 +00:00
Henri215
4237f77be1 Fixing a few grammar issues (#23842) 
* fixing some typos and spacings

* another one

* not that one

* even more
 2024-01-25 11:44:38 -06:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
Qwertytoforty
50b6b5e7d1 Changes power gloves to a bio chip, buffs it. (#23622) 
* wip

* it works yipee

* Update code/game/objects/items/weapons/implants/implant_shock.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>

* Did you know, in terms of making me suffer, full conflicts

* Update code/_onclick/click_override.dm

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

* yes

* Update code/game/objects/items/weapons/bio_chips/bio_chip_shock.dm

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-01-14 12:27:37 +00:00
Ryan
11717823df Power Code Cleanup + Conversion to Regional Powernets [Refactor Only] (#20598) 
* initial edits

* more cleanup, yipee

* moving shit around

* dme fixes

* fixes file ticking issue

* more dme fixes + duplicate files???

* Apply suggestions from code review

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

* glass floor fixes

* Apply suggestions from code review

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

* requested reviews

* the most painful bugfix of my life

* forgot to remove some debug stuff

* fixed issues with excess power

* fuck powernets (fix)

* Update code/modules/power/powernets/README.md

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-05-31 20:55:10 -05:00
GDN
87de861f8f middle click overrides no longer also override alt-click if the middle click action fails to resolve (#20657) 
* middle click overrides no longer also override alt-click

* better
 2023-04-22 00:01:32 -05:00
GDN
93fc25782f makes clingstings GC (#20656) 
* makes clingstings GC

* steels review
 2023-04-21 23:53:30 -05:00
BiancaWilkson
7592bc64ce Power gloves deal stamina damage instead of weakening. (#19508) 
* No more weaken + Better description

* Better attack log

* Now also throws people

* Lower cooldown on request

* Commit farie's review

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

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-05 13:45:37 +00:00
BiancaWilkson
2c65e0901c Fixes an exploit with the power gloves (#19502) 2022-10-24 21:48:42 +01:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262) 
* This is only the beginning

* Update stack.dm
 2022-10-10 20:50:29 +02:00
Charlie
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579) 
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-05-24 16:35:26 +01:00
Vi3trice
598675bac3 Fix - Add logs to power gloves (#17177) 2021-12-01 18:28:18 +01:00
SabreML
0b375de42c Removes the the vast majority of 'The the' from the the code (#15597) 
* The the

* Some more

* Review 1

* A couple more
 2021-06-20 10:20:32 -04:00
AffectedArc07
f2770ed6be Merge remote-tracking branch 'ParadiseSS13/master' into brutal-part1 2021-03-11 18:41:17 +00:00
Fox McCloud
8947e97f3b Refactors Electrocution and Tesla Zapping (#15357) 
* Refactors Electrocution and Tesla Zapping---Improves Supermatter and Tesla

* forgot this one

* fixes and styling

* last tidbits hopefully

* machine frames

* use flags

* styling
 2021-02-03 20:52:03 +00:00
AffectedArc07
f5f97882cf BRUTAL Part 1 - No proc var/ in procs 2021-02-01 14:10:08 +00:00
SteelSlayer
8091e5f151 Refactors how targeted changeling stings are handled (#14509) 
* cling click refactor

* uses middleClickOverride instead

* remove old click_intercept

* this also doesn't need to exist anymore

* wording

* this is more efficient so we don't have to keep New'ing and qdel'ing the datum
 2020-10-17 13:52:07 -04:00
AffectedArc07
04ba5c1cc9 File standardisation (#13131) 
* Adds the check components

* Adds in trailing newlines

* Converts all CRLF to LF

* Post merge EOF

* Post merge line endings

* Final commit
 2020-03-17 18:08:51 -04:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Fox McCloud
59bae1e02d electrocute_act is bugged 2019-04-06 22:51:42 -04:00
Fox McCloud
87f9ff92df no resists for you 2019-04-06 01:52:08 -04:00
Fox McCloud
29002efd98 Updates and Buffs Power Gloves 2019-04-06 01:38:02 -04:00
Tayyyyyyy
919bd7aaf2 Replace \his, \he, \him, \himself 2018-05-25 18:39:37 -07:00
Fox McCloud
5c4aa9b3fd Removes All Weapons 2018-04-15 16:25:56 -04:00
Fox-McCloud
4df07bd3c3 Power Gloves Sound Fix 2016-10-11 11:51:59 -04:00
TheDZD
c51e6674cb Of powergloves and pedantry 2016-06-01 17:09:16 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message) 
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
 2016-04-05 08:15:05 -07:00
SamCroswell
73bf040ba4 Middle Click Override 2015-07-16 21:51:20 -04:00