cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,936 Commits 26 Branches 2 Tags
910d07561e942e5b3a32b5da4e37eb02224dbeb0
Commit Graph

11314 Commits

Author SHA1 Message Date
Nathan Winters
65978a1070 Fix cryo cells not autoejecting patients with burn wounds (#20967) 
* Don't count permanent injury as organic

* Fix direct `cause_burn_wound()` calls not updating health
 2023-05-02 22:00:00 +02:00
Qwertytoforty
21a6cad1ee tweaks / fixes vetus a bit (#20910) 
* tweaks vetus a bit

* probably should still hit the turf

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-02 21:28:58 +02:00
GDN
9cff9cbabf cleans up some giant spider code, moves verbs to action buttons (#20596) 
* cleans up some giant spider code, moves verbs to action buttons

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Co-authored-by: Ryan <80364400+Sirryan2002@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: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-02 21:19:18 +02:00
Ordosian
0d32793324 Squashed (#20749) 
Diona


Dme Fix?


DMe Fix


X


Requested Change


Rebase


Rebase V2


Rebase V3

Co-authored-by: Ordosian <Ordosian@gmail.com>
 2023-05-02 20:58:25 +02:00
Qwertytoforty
63093317b4 Fixes being able to download an already downloaded pai. (#20946) 
* pais should no longer commit mitosis

* Update code/modules/mob/living/silicon/pai/recruit.dm

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

* Update code/modules/mob/living/silicon/pai/recruit.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-04-28 09:52:50 +01:00
Taran
e1effdfb7a Prevents sec bots from cuffing when turned off (#20951) 
* prevents sec bot cuffing while off

By adding a check for if a sec bot is on when actually applying cuffs, sec bots can be stopped mid cuff by turning them off

* makes src implicit

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-04-28 09:52:05 +01:00
Luc
611b025596 Removes an accidental undef (#20932) 2023-04-27 18:38:43 +01:00
Nathan Winters
efecd97f76 Slightly refactors adjustCloneLoss() and setCloneLoss() (#20838) 
* Fix 0 cloneloss unmutating all organs only 20% of the time

* Clean up the rest of `adjustCloneLoss()`

* Add missing `setCloneLoss()` override for carbons

* Fix setting cloneloss to 0 not unmutating organs

* Fix the code instead

* Someone forgot about this operator

* Sean review; minor cleanup

* Deduplicate mass unmutation

* gnarg
 2023-04-25 21:13:33 +02:00
Luc
748d5f91c2 Makes the Brand Intelligence event a bit more dangerous (#20904) 
* Adds mimic support

* add some tiltable checks

* tuning, some messages

* Remove spurious comment

* be extra sure we attack em

* Mimic vendors, when killed, may break.
 2023-04-22 09:58:40 +02:00
Qwertytoforty
de1a8a6670 Did you know, in terms of design compatibility... (#20879) 2023-04-22 09:44:57 +02:00
Luc
3801f43b42 Add follow link to grey psionic communication (#20877) 
* add follow link to grey language

* revert
 2023-04-22 09:44:48 +02:00
GDN
1b361c7366 fixes an ai UID runtime (#20876) 
* fixes an ai UID runtime

* Update code/modules/mob/living/silicon/ai/ai_mob.dm

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

* Update code/modules/mob/living/silicon/ai/ai_mob.dm

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-04-22 09:44:40 +02:00
Henri215
627a46a068 more options for matter decompiler (#20874) 2023-04-22 09:44:33 +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
S34N
4a5fb011e6 515 Compliance part 2 (#20809) 
* more illegal procpaths

* Update code/modules/ruins/lavalandruin_code/puzzle.dm

* REGEX_REPLACE_HANDLER

* shuttle fix
 2023-04-22 09:28:54 +02:00
matttheficus
e250959bc7 Tweaks Gasping and Deathgasp Range + Reduces Gasp Volume with Oxyloss (#20753) 
* -20db supressor

* garrote 7 range + wall block

* deathgasp 9 + scaling gasp volume with oxyloss

* Revert "garrote 7 range + wall block"

This reverts commit 0e9e8de5ef.

* Revert "-20db supressor"

This reverts commit f29e4558c2.
 2023-04-22 09:27:45 +02:00
Coolrune206
2478724a09 tourte is knocking on my window requesting stuff (#20693) 2023-04-22 09:17:17 +02:00
GDN
93fc25782f makes clingstings GC (#20656) 
* makes clingstings GC

* steels review
 2023-04-21 23:53:30 -05:00
GDN
8443203af9 greatly improves observer GCing (#20560) 
* greatly improves observer GCing

* works on logout now
 2023-04-21 18:06:34 -05:00
BiancaWilkson
5751f6e1ff Adds parrying to CQC (#20634) 
* heh, almost made me use ten percent of my power

* appeasing the GC gods (GDN)

* hee hoo

* Update code/modules/martial_arts/cqc.dm

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

* Update code/game/objects/items/hand_item.dm

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

* more return styling

* Update code/modules/martial_arts/cqc.dm

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

* no more wrapper

* the extent of my spriting skills

* fixes double slap sound

* slap emote also works

* try to remember the advanced lessons of CQC

* i hope this fixes the merge conflict

* Chefs are no longer perma-combat trained

* Chef CQC now uses signals to activate parrying

* Makes it easier to add it to other martial arts

* resolving merge conflict from ParadiseSS13#20620

* Revert "resolving merge conflict from ParadiseSS13#20620"

This reverts commit 30ea29a6a8.

* Revert "try to remember the advanced lessons of CQC"

This reverts commit e8daeb4d1a.

* try to not conflict the basics of CQC

* Update code/modules/martial_arts/cqc.dm

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

* Update code/modules/martial_arts/cqc.dm

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

* lol, lmao even

* GDN was right, this is funny

* Update code/modules/martial_arts/cqc.dm

farie review pt. 1

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

* Update code/modules/martial_arts/martial.dm

farie review pt. 2

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

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

farie review pt. 3

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-04-15 22:18:18 +02: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
Farie82
d37d998bc8 Ghosts now don't call moved twice (#20751) 2023-04-04 09:43:46 +01:00
GDN
6ac3c0a90f xenoborgs can now select any normal borg module as well as the hunter module (#20423) 
* xenoborgs can now select any normal borg module and the hunter module

* improved

* no longer returns force modules if there are already force modules
 2023-03-30 23:45:16 +02:00
Cocacolagua
e7f4a8ffae Fixes flipping through walls (#20714) 
* no more flipping thru da walls!!!!

* now it works on mobs on harmintent

* ...and tables

lewl

* resolve. mhm.hm yeah.

* lol

* yeah whatever you say REVIEWER

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-27 21:30:31 +02:00
GDN
0a9d891b42 fixes revolution not working (#20709) 2023-03-27 21:28:29 +02:00
FallingLights
9ce84a827a Added prox_sensor to items list magnetic gripper (#20632) 2023-03-27 21:11:48 +02:00
S34N
b90845c2e3 Balances skeletons by adding a subtype (#20587) 
* balance skellies

* spoopy and scary

* more skellybones

* Ancient

* Apply suggestions from code review

* Update code/modules/mob/living/carbon/human/species/skeleton_species.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-27 20:39:24 +02:00
Zelf
6d5de3872f enthralled flared and imp (#20508) 
for real this time
 2023-03-26 12:25:46 +01:00
Luc
6bf5172bec Fix SM (and some other) follow links (#20554) 
* hoopefully fix SM message tracking being really weird

* update some more follow targets

* Apply suggestions from code review

hehe

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

* Cleans up some loose ends, implements for arrivals announcer too

* Changes target to the new deactivated core

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-03-26 12:17:37 +01:00
Vi3trice
7120d25d73 SO RUDE (#20595) 2023-03-26 12:09:44 +01:00
Contrabang
b5f3b7442b ghosts can point again (#20617) 2023-03-26 11:58:38 +01:00
GDN
690376da3a fixes a cult construct death runtime (#20675) 
* fixes a cult construct runtime

* Update code/game/gamemodes/cult/cult_mode.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-03-26 11:50:27 +01:00
Contrabang
eb765de732 Burning pAIs have a proper overlay (#20698) 
* paiburn

* s34n review

* spacing
 2023-03-26 11:46:15 +01:00
GDN
55ae864821 adds a message notice that you can no longer move as a slime (#20626) 
* adds a message notice that you can no longer move as a slime

* Update code/modules/mob/living/simple_animal/slime/slime_life.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-03-24 21:42:33 +01:00
GDN
333dcf32c0 fixes gutlunch udders not properly GCing (#20695) 2023-03-22 18:55:03 -04:00
Contrabang
dfbb5da926 fixes mice (#20414) 2023-03-22 10:07:53 -05:00
GDN
5557f6ae32 Nukes detailed examine (#20314) 
* Nukes detailed examine, converts to normal examine stuff

* THE SHOOTENING

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

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>

* oop

* Update code/modules/mob/living/silicon/robot/drone/maint_drone.dm

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

* Update code/modules/power/apc/apc.dm

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

* Update code/modules/projectiles/guns/energy/nuclear.dm

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

* bam

---------

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-03-17 16:20:53 -05:00
Qwertytoforty
5197d1b62a Completely reworks the tesla revolver (need to work on damage values) (#20295) 
* part one: the rest of a fucking owl

* kit

* shocking changes

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

* Update code/modules/projectiles/projectile/energy.dm

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

* Update code/modules/projectiles/projectile/energy.dm

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

* Update energy_projectiles.dm

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-03-17 10:26:02 -05: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
Luc
eafe04f41f Pops up a little bubble when you're requesting a high-five, along with some other emotes (#20472) 
* High five!

* Add in-hand use

* use in hand too

* closing remarks

* better looking

* Fixes daps

* grab my hand fat man

* hand shake

* Implement missed messages

* i can spell

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

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

* Review concerns

* Add some auto-doc, minor changes

* more cleverly handles pointing

* Update code/modules/point/point.dm

Path clarity

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-03-15 20:37:54 +01:00
AffectedArc07
72ba1ada7b Nukes karma (#20628) 
* Nukes karma

* Skin + logic

* TGUI Build
 2023-03-14 19:14:47 +00:00
Contrabang
82aed17b5c Fixes a runtime with mindless revolutionaries (#20565) 
* no more monkey runtimes

* grammar review
 2023-03-13 22:55:07 +00:00
Luc
74cbfc57a3 fixes venus trap (#20526) 2023-03-13 22:27:37 +00:00
GDN
7e297d154d malf drones get zeroth law alerts again (#20494) 
* malf drones get zeroth law alerts again

* Update code/modules/mob/living/silicon/robot/robot_laws.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-03-13 22:16:55 +00:00
Samman166
491a51ecb9 Fixes a bug that allowed turret guns to be fired by mobs. (#20451) 
* TRIGGER_GUARD_NONE works properly

* uses FALSE instead of 0
 2023-03-13 22:13:27 +00:00
Henri215
6a25a39975 fake mask for floor cluwne loot (#20564) 2023-03-13 22:37:41 +01:00
Contrabang
2e19c7f6d7 Prevents spawning of off-station mobs (#20538) 
* no more syndicate cow

* i swear I commited this the first time
 2023-03-13 22:37:24 +01:00
GDN
2bc9f02dd6 Deletes the "Jump to mob" verb from ghosts (#20559) 
* Deletes the "Jump to mob" verb from ghosts

* All smoothed out
 2023-03-11 01:21:16 +01:00
Adri
fb0a27d553 Fixes facehuggers trying to attach to golems' face (#20556) 2023-03-11 01:20:36 +01:00
GDN
2e94bfb5cc fixes mob/living mind gc issues (#20376) 
* fixes mob/living gc issues

* let's try this as an experiment
 2023-03-08 16:49:45 -05:00