cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 07:23:42 +00:00
Code Issues Packages Projects Releases Wiki Activity
54,770 Commits 29 Branches 2 Tags
5785c3638fb3d422fe265a45f64cfcbace778e36
Commit Graph

24844 Commits

Author SHA1 Message Date
Charlie
5785c3638f Removes Shadowstep. replace it with 2 powers for each vampire type. (#18951) 
* WIP

* shadow boxing

* garg + hemomancer

* dantalion and stuff

* oops

* some tweaks

* sprites, tweaks and TGUI

* ready for review

* review

* forgot some sean comments

* oops

* prevents people walking over shockwaves

* shadow boxing DPS down to 20

* oops

* affected review
 2022-09-30 12:32:53 -05:00
Contrabang
ef133c5187 [TGUI] Health sensor + Refactor (#19111) 
* tgui Health sensor

* quick fix, we want to clear out the var

* ughhh

* health update

* sirryan review

* exploit fix

* this is more how it was supposed to be

* no bundle changes because only formatting

* aaa indentation is hard

* ahaha indentation strikes me again
 2022-09-30 11:42:52 -05:00
Henri215
5c9f8a125a Adds identification card compartmentalizer (#19076) 
* added the new idcomp

* reverting autodoc comment

* updated description
 2022-09-30 11:40:57 -05:00
Adri
6011284742 Adds a hardened version of the anti-drop implant (#19182) 2022-09-29 20:43:36 +01:00
Henri215
91ca64c465 fix collectable welding helmet (#19155) 2022-09-29 20:42:39 +01:00
FloFluoro
32db03c463 Held items no longer prevent Xenomorph disarm knockdown + stamina damage (#19142) 
* Held items no longer prevent xenomorph disarm knockdown + stamina damage

* Stam damage is now handled by a var, no longer fixed to 30
 2022-09-27 16:23:47 +01:00
Vi3trice
ebf9a7b5e8 Update point.dm (#19181) 2022-09-26 09:32:23 -05:00
Henri215
ba032a18c3 Adds new descriptions to several cartridges (#19071) 
* added new descriptions to several cartridges

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

* Update code/modules/pda/cart.dm

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

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-25 21:02:53 -05:00
Charlie
1d132cf569 fix (#19127) 2022-09-25 21:01:18 +01:00
GDN
d86b6a4665 Reworks alien facehugger incubation (#19084) 
* Well it works, but I need to check something first...

* Adds new maffs that we can use from Vi3trice

* minor var mistake

* Addresses steels + ryans review

* Oops
 2022-09-25 13:12:11 -05:00
Qwertytoforty
b3cd14d3ad Reworks nanocalcium injectors to be better. (#19122) 
* Reworks nanocalcium injectors to be not shit

* better

* no s

* better math

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

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

* removes dead, updates percent

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2022-09-25 17:48:12 +01:00
Luc
e2e15d5579 [GBP: NO UPDATE] Fixes xeno surgery (#19119) 
* Fixes optable

* Xeno surgery works again, but at what cost?
 2022-09-25 17:47:09 +01:00
Sheep
b5357494c4 Fix ParadiseSS13#19098, update chassis mod install/uninstall procs. (#19118) 
Change the current_skin in chassis_mod/install, not the current_icon.
Same with chassis_mod/uninstall
 2022-09-25 17:45:54 +01:00
Henri215
98f4520a43 bald expansion and added shave bodyflag (#19117) 2022-09-25 17:44:27 +01:00
Qwertytoforty
efca09e5a0 emergency shuttle console is indestructable (#19115) 2022-09-25 17:41:42 +01:00
Qwertytoforty
51d7989e6f might as well JUMP! (#19088) 2022-09-25 17:35:10 +01:00
Adri
33f7c1ef47 Adds an NNO-specific gas mask, the "nanotrasen navy officer gas mask". (#19081) 
* Adds an NNO-only gas mask

* Adds tajaran, unathi, vulp masks

* Replaces strip_delay with seconds

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-09-25 17:32:32 +01:00
Luc
96aab66dc6 Add cooldown for unintentional emotes (#19078) 
* Add cooldown for unintentional emotes

* Oops, let's try that again.
- Adds a separate cooldown system for unintentional emotes.
- Unintentional emotes will fire audio at most once every 2 seconds.
- Emotes like deathgasp can override this out of necessity.
- Scream's is longer because...come on.

* The part that makes the rest of it actualy work
 2022-09-25 17:31:26 +01:00
alex-gh
6aefc49682 Allow changing PDA owners (#19077) 2022-09-25 17:30:09 +01:00
Vi3trice
7a3f2ed506 Port TG pointing to inventory thought bubble, and expand valid pointing targets (#19072) 
* Well that actually works

* Update atoms_movable.dm

* Now you can point at things inside of things.
 2022-09-25 17:29:51 +01:00
alex-gh
cf8df529e5 Fixes anomalies spawning in walls (#19064) 
* Fixes anomalies spawning in walls

* break

* Update code/modules/events/anomaly.dm

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

* better log message

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2022-09-25 17:27:27 +01:00
Henri215
4b1bae4de4 "None" and "Slime Jelly" blood types added for the appropriate species (#19045) 
* none and slime jelly blood types

* random b_type instead of A+ only
 2022-09-25 17:25:58 +01:00
S34N
39b335b2f1 Resprites ice cream machine and food cart (#19033) 
* kitchen machine

* thing

* mcramon
 2022-09-25 17:22:25 +01:00
Adri
b32f499e72 Removes xenomorphs from xenobiology gold slimes (#19002) 2022-09-25 17:21:17 +01:00
Qwertytoforty
ebd492f3bb Blood drunk will now transform its weapon during melee (#19139) 2022-09-25 17:07:46 +01:00
FloFluoro
5b60ae5c1e IDs now take priority over PDAs in get_idcard (#19051) 2022-09-25 17:03:21 +01:00
Sheep
5d55358159 Fix #18699 (#19160) 
Check the return value for any null values before doing anything with it to avoid
a runtime.
 2022-09-24 20:22:26 +01:00
S34N
e944d58c84 Medical tool resprite (#19048) 
* medical tools

* removes war crimes

* tidies this up

* fix this please
 2022-09-24 19:20:33 +01:00
Henri215
de7052c410 locator correct path (#19158) 2022-09-24 11:28:31 -05:00
S34N
924e8cc949 Renames non-cybernetic implants to bio-chips (#18937) 
* CHIPS

* microchip implanter

* more chips to purge

* bio-chip

* catches more things

* tgui

* final merge changes

* Update code/game/machinery/cloning.dm

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

* oops

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-09-24 14:24:25 +01:00
AffectedArc07
34927f05ab Wryn removal v2 (#19112) 
* Removes Wryn

* and the sprites

* Fixes

Co-authored-by: Fox McCloud <Fox-McCloud@users.noreply.github.com>
 2022-09-24 12:53:34 +01:00
Contrabang
0efd7c6c50 ok right branch this time (#19110) 2022-09-24 12:53:13 +01:00
Contrabang
4f1b1389f7 Ants will no longer spawn on food that is on racks (#19023) 
* soup debugging but it goes to the right place

* hal review

* ant improvement

* grammar

* sirryan review

* optimizations

* sirryan review

* im a bit crazy like that
 2022-09-21 20:58:56 -05:00
alex-gh
14e3752aaf Allow silicons to use electric smart fridges. (#19016) 
* Allow silicons to use electric smart fridges

* fat fingers
 2022-09-21 20:47:28 -05:00
Henri215
c2aba93317 removed var digestion_ratio (#19114) 2022-09-21 21:50:06 +01:00
Luc
b060b4b6d2 Surgery Hotfixes: Part 1 (#19108) 
* Fixes up a few notable bugs with surgery
- Synthetic cavity implants now have a close step (oops!)
- Fixes up logic for intermediate surgery steps

* nah I'll deal with this later

* oops this was unused
 2022-09-21 21:46:03 +01:00
Qwertytoforty
065ffff420 Removes radioactive gel from blobs (#19103) 
* Removes radioactive gel

* removes the colour define
 2022-09-21 21:45:05 +01:00
Henri215
5e4d0db18a Fix #17543 Genetics UI Block 32 Doesn't Properly Change Gender (#19120) 
* fixed gender being stuck in plural at genetics

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

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2022-09-21 15:14:06 +01:00
Christasmurf
67481115fc alloweditems (#19102) 2022-09-20 13:26:50 +01:00
GDN
9cda5ed786 Buffs Alien Queens (#19106) 
* Buffs alien queens

* reviews and bigger queen

* Scoping to humanoid
 2022-09-20 13:15:44 +01:00
AffectedArc07
3975e3531d Fix some busted logic (#19105) 2022-09-19 13:00:37 +01:00
Qwertytoforty
d530aeba33 Energy crossbow gunkits now need a laser gun (#19087) 
* Lockboxes energy crossbow gunkits

* converts to requiring a laser gun
 2022-09-18 22:02:09 +01:00
AffectedArc07
1d008754da [READY] Bot Refactor (#18930) 
* [WIP] Bot Refactor

* No more spawns, sleeps, and working EDs

* Mules

* GC fixing

* h
 2022-09-17 12:46:25 +01:00
ElorgRHG
e4e06f2759 Paradise's soul removal part one of many: Captain's drip and resprite (#18891) 
* The sprites and stuff

* Vox re-add

* Why did I do this

* Last tweaks

* Pixel differences

* I have decided that captains need a beret

* I have decided that Ian needs drip too

* This exists sadly

* I forgor the gloves 💀

* CONFLICTSSSSSS

* "empty" commit

* White tunic

I don't get the appeal still

* bluE

* Painful

This will most likely get closed anyway so whatever

* OLD TUNICCCCCCCCC

* Conflicts

* Loadout captain's berets

* More conflicts, yay
 2022-09-17 11:13:58 +01:00
Contrabang
938fbb5004 magboooooots (#19069) 2022-09-17 10:53:56 +01:00
FloFluoro
24895dc6c5 Beer2 no longer instastuns (#19040) 2022-09-17 10:47:40 +01:00
Qwertytoforty
f9defc92bf Adds Fusion Gauntlets to RND (#18804) 
* do a once over first

* merge conflict shit

* armor pen to modern stuff

* Apply suggestions from code review

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

* BOY SMELL THEM MERGE CONFLICTS

* icons / final changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
 2022-09-17 10:45:58 +01:00
Adri
516e32fafb When removing traitor role, auto remove the uplink (#19034) 2022-09-17 10:44:34 +01:00
Contrabang
f86f59f177 Revert "Changes SR to not be an instant and unavoidable revival. (#18910)" (#19089) 
This reverts commit 37a3902a83.
 2022-09-17 00:15:21 -05:00
FloFluoro
15a0edc588 Fixes facehuggers facehugging forever (#19067) 
* Fixes facehuggers facehugging forever

* Removed unnecessary "as mob", readded blindness because clothing-induced blindness doesn't fully mimic the status effect
 2022-09-16 22:45:52 -05:00