cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 22:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
56,028 Commits 27 Branches 2 Tags
feb480e39c0dfa6ca7f0c21f4fa718b86bb5cb13
Commit Graph

192 Commits

Author SHA1 Message Date
HMBGERDO
02db93e37e Stunbaton delayed knockdown now respects antistuns (#21069) 
* stunbaton delayed knockdown now moved into status effect

* renaming proc to keep its meaning

* made STATUS_EFFECT_DELAYED as status effect for any delayed logic, removed STATUS_EFFECT_BATONNED

* cleanup, little bug fixing

* cleanup

* whoopsie

* updates

* signal string changed

* Update code/datums/status_effects/neutral.dm

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-06-01 18:36:44 -05:00
S34N
bdb8039c8f Adds gorillas and cargorillas (#20830) 
* goril

* goril2

* arms

* goril3

* goril4

* rampaging

* emote

* trait

* more gorilla

* ooga

* Magillitis Serum Autoinjector, crates

* return to monke

* remove unused trait

* oops

* sirryan

* earth

* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm

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

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

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

* fixes and stuff

* gorilla text clarification

* tweak probs, stop if dead

* volume

* gorilla sleeping attack

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@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: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2023-06-01 18:36:07 -05:00
HMBGERDO
9d5a876676 flash ability to destroy shadow snare (#21076) 
* flash ability to destroy shadow snare

* Update code/modules/antagonists/vampire/vampire_powers/umbrae_powers.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-22 22:24:26 +02:00
Vi3trice
6bf89dd257 Check if on the same turf (#20998) 2023-05-22 22:04:52 +02:00
Henri215
dc75a748f1 Fixing common spelling mistakes part 3 (#20870) 
* Fixing common spelling mistakes part 3

* collectable

* another collectable

* part 3.2

* "</span>."

* A bunch more fixes
 2023-04-22 09:44:27 +02:00
GDN
93fc25782f makes clingstings GC (#20656) 
* makes clingstings GC

* steels review
 2023-04-21 23:53:30 -05:00
Charlie
e6085895c1 burn wounds, for real this time (#20542) 
* burn wounds

* user feedback

* ready for review

* sean review

* Apply suggestions from code review

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

* surgery fix

* other repair methods

* GDN review

* health scanner feedback

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* bodyscanner print out

* Update code/game/machinery/adv_med.dm

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2023-04-14 15:58:38 +02:00
Coolrune206
d19e8dfb0f Reworks Cling Hivemind (#20375) 
* reworks Cling Hivemind

* bye bye old vars

* protects starting DNA
 2023-03-15 20:40:39 +01:00
S34N
69bd5ad19b Adds more QoL logs for admins (#20468) 
* More logs

* why is this not ignored

* you never know if someone has busted DNA

* Update code/controllers/subsystem/jobs.dm

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>

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-03-13 22:24:22 +00:00
Coolrune206
f834d6ec28 Fixes runtime with Chitinous Armor being punched (#20502) 
* quick chitin armor punching fix, thanks GDN

* standing here, I realize

* you are just like me, trying to make history

* SEAAAAAAN review

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-13 22:19:18 +00:00
GDN
8ea96d8e36 Makes the armblade handle more like the fireaxe with opening doors (#20313) 
* armblade tweaks

* mistaken regression

* farie's review

* early return

* Update code/game/machinery/doors/airlock.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-08 19:57:14 +01:00
S34N
4928d8432c Fixed nukie borg ghost poll incorrectly showing operative icon (#20418) 
* proper icons in prompt

* fixed chat role name too
 2023-02-27 10:49:01 -06:00
Coolrune206
9d6c7d63bb Gives chitinous armor durability (#20394) 
* gives chitinous armor durability

* Henri review

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

* slight var name change

* plasma cutters

* SEAAAAAAAAAN review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-02-25 18:52:24 -06:00
Luc
b0776d35ef Re-fixes limb regeneration, now with 100% fewer brain deletions (I hope) (#20157) 
* Prevents clings from quick regenerating bodyparts

* Clarify a comment

* Reworks to work with monkeys and other sources as well

* qdel organ if it doesn't get inserted

* Use initial instead of creating and qdeling

* Revert unnecessary cast

* Ensure organs are inserted as they were before

* fix some warnings

* here be dragons
 2023-02-15 21:16:00 +01:00
Henri215
42d1758b2e Fixing common spelling mistakes part 2 (#20360) 
* Fixing common spelling mistakes part 2

* "supressed"
 2023-02-08 21:20:35 +01:00
Springf
9504e00ba2 Refactor Fleshmend into a Status Effect (#20031) 
* Fleshmend Refactor

* Reworked buff to match existing code in effect

* Clean up formatting

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

* Syntax and formatting updates as per comment suggestions

* Update code/datums/status_effects/buffs.dm

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

* Clean up array code

Cleaned up some array code, changed a segment where an array was manipulated while iterating through it to instead collect expired instances and remove them after.

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-02-07 13:50:37 -06:00
AffectedArc07
b34e8fa301 [READY] CI now bans files with the same name (#20195) 
* CI now bans files with the same name

* Part 1

* Warriorstar python tweaks

* Part Deux

* Fix unticked

* fix
 2023-02-04 16:33:41 -06:00
Qwertytoforty
3963f9b070 shadow demon / rev in spellbook (#20149) 
* shadow demon / rev in spellbook

* tests code, icons

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-01-28 09:35:08 +01:00
Luc
b940c1eb21 Allows clings to regenerate without a brain. (#19856) 
* Move brain organ code where it belongs

* Rename too

* WIP, but hey, it kinda works now.

* Account for a few missing heads

* Remove vital check, killing the user on death

* Let defibs and scanners better deal with these

* Remove debug brains

* Clean up some more contingencies

* More head checks

* Update code/modules/antagonists/changeling/datum_changeling.dm

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

* Fixes up signal business

* some stuff from sean's review

* Add some type safety checks for heads

* oops

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

get this in there too

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

* Remove decap sword

* Quick suggestions

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

* Addresses shedding problems

* Add new defib changes

* this is why we have CI

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-01-20 19:25:51 -05:00
SteelSlayer
2840629fac free objective be gone (#20217) 2023-01-19 12:49:30 -05:00
Eric6426-Blossom
190313723b Fixes changelings and legion cores allowing for revival within Slaughter and Laughter demons (#20166) 
* DemonFix?

* FaerieReview

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

* Fixpart2

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

* safetyqdel

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-01-16 21:53:50 +01:00
Coolrune206
71d7eb1de0 Removes the Speed-boost from Cling Epi OD (#20127) 
* gives the wizard some more clownish options

* removes speed boost from cling Epi OD

* Revert "gives the wizard some more clownish options"

This reverts commit 938b1c8ebd.

* Lewcc review

Whack

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

* Hal9001 Review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-01-13 17:06:01 +01:00
Henri215
e711cd5921 Fixes lots of common spelling mistakes (#20086) 
* Fixes common spelling errors: "atleast", "infront", "succesfully", "alot"

* recieve -> receive

* spelling mistakes: percieve, wierd, posession, seperate, succesful

* Spelling mistakes: noticable, concious, enviroment, existance, foward, interupted, independant

* tgui rebuild

* lets make this run

* "succeded" mispelling

* reverting money spam change
 2023-01-08 20:12:31 -05:00
Coolrune206
7a7ee2168a you're dead dead (#20110) 2023-01-07 19:57:44 +00:00
Qwertytoforty
7fb017915f Makes cling tentacle more reliable / less shit (#19855) 
* Cling tentacle love, part 1/2

* legcuff sprite

* S34N's changes

* Apply suggestions from code review

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

* attack logs.

* BOY I LOVE ICON CONFLICTS 1/3

* BOY I LOVE ICON CONFLICTS (3/3)

* EYE FOR AN ICON

* description update

* Final changes, whoops

* [H]

* swap the order

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-01-06 21:31:37 +01:00
S34N
d1e30b9854 Revert "Prevents limb regeneration when changing species (#19945)" (#20102) 
This reverts commit 4b255c16e4.
 2023-01-06 21:23:09 +01:00
Luc
4b255c16e4 Prevents limb regeneration when changing species (#19945) 
* Prevents clings from quick regenerating bodyparts

* Clarify a comment

* Reworks to work with monkeys and other sources as well

* qdel organ if it doesn't get inserted

* Use initial instead of creating and qdeling

* Revert unnecessary cast
 2023-01-05 11:52:34 -06:00
Qwertytoforty
3d521286bc Buffs cling emp from 2, 4 to 3, 5 (#19982) 2023-01-02 15:36:17 +00:00
Charlie
8ef4aa727e Adds Shadow demons (#19732) 
* reshuffle

* shared base type

* moves this to the base type

* the monster

* event

* FUCK

* better sprites

* refactors bloodcrawl, more nice sprites

* review stuff

* Apply suggestions from code review

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

* heart of darkness

* pre TM tweaks

* ARGH

* hopefully fixes double hits

* tweaks

* derp

* tweaks

* TEMP RUNTIME REMOVE LATER

* fixes

* runtime fixes

* cig runtime fix

* review + another runtime fix

* re adds sprite

* removes runtime

* oop I forgor

* DRUNK CODING

* SPRITES

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-29 11:26:37 -06:00
BiancaWilkson
ce5f8059b3 Buffs and cleans up atomic panacea (#19904) 
* panacea uses invoke async

* Update code/modules/antagonists/changeling/powers/panacea.dm

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

* its a status effect now

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-12-29 16:31:12 +01:00
AffectedArc07
e91b6c94f7 Renames QDEL_LIST to QDEL_LIST_CONTENTS (#20006) 
* Renames QDEL_LIST to QDEL_LIST_CONTENTS

* derp
 2022-12-29 14:28:40 +00:00
meow20
7e1e1b167d Prevents vampires who didn't drain anyone from being tested in the chapel (#19995) 
* Update vamp_datum.dm

* Update vamp_datum.dm

vampires once again suffer in space, regardless of how much blood was drained.

* Update vamp_datum.dm

* better code, same function

* Update vamp_datum.dm

* skree where did this came from
 2022-12-28 12:15:59 -05:00
SteelSlayer
80d2959d19 Refactors antag team code. Adds an admin UI to interact with teams (#19870) 
* adds antag team framework code

* Apply suggestions from code review

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

* sirryan review

* adds the ability for admins to add members

* oops

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-12-26 19:32:55 +00:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Charlie
eb81a44c78 shut up qwerty (#19972) 2022-12-24 11:03:11 -05:00
Charlie
1cfc5a04f1 changeling buff (#19838) 2022-12-19 11:19:51 -06:00
SteelSlayer
a47c3c9bd8 evo menu exploit fix (#19886) 2022-12-09 07:34:43 +01:00
SteelSlayer
d95f2fd97c fix steal identity objectives not syncing to their linked assassinate objectives (#19809) 2022-12-03 08:35:13 -05:00
Coolrune206
1a2ab9e6a1 gives some info about how headslugs work (#19741) 2022-11-23 22:23:31 -06:00
Sirryan2002
61145a02f8 [TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash (#19209) 
* initial edits

* initial edits

* converting shit over to machinery/economy

* vending and mapping fixes

* vending fix pt.2

* Converts Supply Economy to Use Space Credits instead of Supply Points

* Job Payment, NanoBank, and Paychecks

* clothing type path fixes (damn merge conflicts)

* fixes map typepath issues

* adjusts supply prices

* Vendor Price Adjustments

* account uplink terminal tweaks

* please pass tests

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* reviews and bug fixes

* Review Suggestions/Fixes and Request Console Rewrite

* edits

* vending changes for merge

* typepath fix

* final tweaks

* proc ref fixes

* Fixes and Tweaks from 2nd TM

* rebuild TGUI

* final tweaks

* Apply suggestions from code review

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

* requested reviews

* tweaks

* updates slot machine winnings

* fixes

* GC fixes

* fixes

* oops. still need to deconflict this

* Apply suggestions from code review

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

* requested changes and bug fixes

* atm runtime fix

* requested reviews

* vend act stuff

* attempt to pass tests

* supply packs fix

* user tochat -> debug log

* FINAL FIXES

* removes CC db stuff

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-11-21 23:30:50 +00:00
Charlie
32ee23832c fixes shadow anchors getting destroyed (#19719) 2022-11-18 18:07:30 -06:00
S34N
b66fb2448c 515 compat 2, ./proc/ boogaloo (#19688) 
* 515 compat 2, ./proc/ boogaloo

* ASYNC

* further CI checks

* aa

* lol escape this / pls

* more of them

* no idea why but this is scuffed so
 2022-11-15 22:06:30 +01:00
Charlie
421777b317 Reworks block chance into Parrying. (#19334) 
* parry component

* converts block chance to parry components

* armour pen, katana fix, pickup fix

* melee parry fix

* removes perfect parries, tweaks armour pen calc

* SIGNAL_HANDLER

* fix

* resist fix

* reduces parry time out time, increases cooldown

* Apply suggestions from code review

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

* fix

* cooldown rebalance

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-11-12 08:49:44 +01:00
SteelSlayer
abec5338de traitor runtime and gc fixes (#19616) 2022-11-11 14:20:59 +01:00
BiancaWilkson
cd864c8a14 Changeling voice mimic doesn't slow chemical production (#19650) 
* Clings only spend DNA points on mimic

* HATE. HATE. LET ME COME TO TELL YOU HOW MUCH
 2022-11-11 14:19:05 +01:00
Octus
27c06ba65b Minor Buff to Cling Augmented Sight (#19642) 
* Update augmented_eyesight.dm

* fixes stuff, and makes eye more reasonable
 2022-11-11 14:18:27 +01:00
S34N
667dd5d4ac 515 Compatibility (#19636) 
* 515 compat

* double spaces

* Callback documentation, aa review

* spacing

* NAMEOF_STATIC

* big beta
 2022-11-08 23:08:40 +00:00
Vi3trice
599221a602 doh (#19566) 2022-11-02 14:22:04 +00:00
Vi3trice
05d93f665a [TM] Port TG Jump Point Search and SSpathfinder (#18984) 
* move along move along

* Update bot.dm

* Diagonals are now more expensive

* Update path.dm

* Update parrot.dm

* Update path.dm

* Tweaks

* Fix cleanbot, add path safety

* Tweaked, added a safety, removed the previous one

* Update medbot.dm

* path.len isn't very safe as a whole, floorbots also had order of operations wrong

* Update medbot.dm

* clings not even once

* Back to the drawing board

* Update path.dm

* Make mules actually clear the drawn path.

* Make bots use step_towards unconditionally instead of flipping between step_to and Move

* Making extra sure the path is cleared. Somehow path was left over.

* Check for length as get_path_to is always true

* This and that
 2022-10-30 15:54:51 +00:00
matttheficus
7bb99cb7bd Contractor Post-Prison Injuries (#19116) 
* it begins

* Test Number One

* it works, i can now break you

* fix vars

* pickproc

* pickproc 2 electric boogaloo

* indentation is hard

* slime/IPC check

* spacing

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* spacing 2 electric boogaloo

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* slime/IPC returns

* oops 2

* null checks

* more changes

* farie review

* spellcheck via lewcc

* farie review

* early return

* today matt forgets how to do logic problems

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-14 13:34:29 +02:00