cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-21 15:51:31 +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
GDN
092fe017a5 Tea heals a bit more if you're british (#21068) 
* chav now gives slight healing on tea

* Update code/_globalvars/traits.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-12 07:52:55 +01:00
GDN
73269c0527 forcemodule fix (#21009) 2023-05-11 11:50:59 -05:00
GDN
53cf9765bc xenos no longer permakill dead carbon mobs by consuming them (#20952) 2023-05-10 14:10:13 -05:00
Nathan Winters
376858d908 Fix 0.1u reagent amounts behaving inconsistently (#20969) 2023-05-10 14:05:34 -05:00
Octus
a7156dce16 Reworks cult sharding to not perma kill mindshielded victims [Needs TM] (#20402) 
* fucking cult

* WERE STILL WORKING ON ITTTT

* d

* Revert "d"

This reverts commit 8a4bf06f5c.

* MOREEEE

* update

* Revert "update"

This reverts commit 65d85eae87.

* only chap can do it now lmao

* WHOOPS

* OK NOW

* Update runes.dm

* Apply suggestions from code review

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

* PLEASE TESTMERGE AAA

* fixes some stuff, improves it

* fixes the code from merge conflict

* Update code/game/gamemodes/wizard/soulstone.dm

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

* fixes a bug with shit not dying due to brains

* Adds some GC stuff, Sirr's code reviews.

* finishes the last changes and reviews

* missed 1

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-09 19:41:40 -05:00
Henri215
a85d4bd9ae Fixes bureaucratic error event runtime (#21010) 2023-05-08 17:11:32 -05:00
Henri215
8809ada03e Thunderdome no longer allows unfair fights (#20981) 
* Thunderdome no longer allows unfair fights

* surplus candidate warning
 2023-05-08 16:44:47 -05:00
Kyani
0e95bc8e03 Update blood.dm (#21032) 2023-05-08 16:34:21 -05:00
Kyani
060bc0d741 Fixed Jestosterone removing clown waddles (#21035) 
* Update misc_reagents.dm

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

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

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2023-05-05 15:48:52 -05:00
Kyani
87201198ef fixes cherry bombs (#20921) 
* fixes cherry bombs

moves prime to AFTER the auto-throw is toggled
added a sleep before the explosion trigger to prevent instant explosions
reafactor'd black powder to explode at its container's location instead of where the black powder's trigger is, to prevent desync between the explosion location and a thrown object

* removed sleep

mistook the desync before as an instant explosion. now that desync was fixed it is shown to not be needed

* Update code/modules/hydroponics/grown/misc_seeds.dm

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

* comments added

* renames location to prime_location

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-05 21:21:11 +02:00
DGamerL
5764b6acaf Typo go brrr (#20997) 2023-05-02 18:24:39 -04:00
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
DGamerL
0241d3060d Rebalancing the BSG (#20953) 
* Rebalancing

* Weight class is now bulky

* Adds a small comment on the cd
 2023-05-02 21:59:28 +02:00
GDN
c0cb7fdc9a Fixes a survival pod runtime (#20941) 2023-05-02 21:59:13 +02:00
Henri215
a5efbd32e8 USSP update part 2 (#20926) 
* USSP part 2

* swapping old version for new one in some places
 2023-05-02 21:59:01 +02:00
matttheficus
fc87927f7b Tool Size Tweaks (#20586) 
* The Great Toolening

* oops all belts (incoming self conflict lul)

* defines shouldnt lie

* mini crowbar TODOs

* beeeeeeeeeg crowbar

* oops it needs a design

* purple kit + vendor fix

* add mini crowbar dmi

* oops forgot this

* i am an idiot sandwhich

* im bad at code

* scratch that, i cant read my VSC

* wrench undo + readd to boxes

* nukies too

* man i cant code

* power tools should logically follow

* formatting

* maybe im free?

* forgot inhands

* Update toolbox.dm

* bluespace belt buff (unironic)

* undo for now

* fixes bluespace/tot belts + adds w_class override

* adds small crowbar to e-toolboxes and tot tools

* power tool fix

* Rnd build path

Co-authored-by: Adrer <erwin@lombok.demon.nl>

* design fix

* merge conflict + small fix

* small name fixes

---------

Co-authored-by: Adrer <erwin@lombok.demon.nl>
 2023-05-02 21:43:06 +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
Qwertytoforty
abf69a81d8 Overdosed chemicals no longer do helpful effects when overdosed (generally) (#20906) 
* Overdosed chemicals no longer do helpful effects when overdosed (generally)

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

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

* balance request

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

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

* od to overdose

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-05-02 21:28:50 +02:00
Contrabang
282f1cb62c Nuke resprite revival (#20888) 
* nuclear revive

* stage fixes

* allows for the core to show while panel is closed

* adds blob nuke

* oops merge failure

* sirryan review

* grammar fix in comment
 2023-05-02 21:28:42 +02:00
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884) 
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

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

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

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

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-02 21:28:34 +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
Kyani
147c5890ef Chem heater now shows beakers when screwed closed (#20930) 
* Update chem_heater.dm

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

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

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

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-05-02 20:58:13 +02:00
McRamon
9d151847fb Resprites ID container at HOP and data disk storage in botany (#20907) 
* sin eradicated

* more sprites

* Update vending.dmi

* disktoaster

* some additions

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

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

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-02 20:58:02 +02:00
Henri215
b9952532eb Adds the bureaucratic error event (#20582) 
* camera failure event

* Increasing the amount

* No disabling cameras on protected areas

* Adds the bureaucratic error event

* human resources department is lore friendly

* Pick instead of rand

* ops

* Added allow_bureaucratic_error to jobs

* scales up with number of engineers

* mundane category

* Update code/modules/events/camerafailure.dm

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

* conflict fix

* No error for blacklisted jobs

* Update code/modules/events/bureaucratic_error.dm

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

* Lewcc review

* better file name

* better name part 2

* farie review

* Apply suggestions from code review

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

* Update code/modules/events/camera_failure.dm

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

* Update code/modules/events/bureaucratic_error.dm

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

* checking for admin only

* Blacklist and small fix

* Farie review

* Update code/modules/events/bureaucratic_error.dm

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2023-05-02 20:57:45 +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
DGamerL
cc1e513c54 Anomalies can't spawn in cryogenics (#20938) 
* Can't spawn in cyrogenics anymore

* Begone ,
 2023-04-27 18:40:00 +01:00
Luc
611b025596 Removes an accidental undef (#20932) 2023-04-27 18:38:43 +01:00
AffectedArc07
ae37f5b22c Updates some backend stuff (#20852) 
* Updates some backend stuff

* Warning

* update

* Adds some indexes for speeeeeeeeed
 2023-04-25 16:21:57 -05:00
Taran
7006f0df45 Updates e-dagger throw speed (#20925) 
increases e-dagger throw speed to 4 from 3 to allow embeds
 2023-04-25 21:15:05 +02: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
Henri215
837e62c4fa Resprites atmos tanks (#20837) 
* Ports atmos tank sprites from CEV Eris

* Mcramon sprites

* fixed one pixel

* Update code/modules/atmospherics/machinery/components/unary_devices/tank.dm

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

* small tweaks to the sprite

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-25 21:13:26 +02:00
Henri215
6826d2ba7b Moving some in hand icons to different files (#20748) 
* Moving some icons out of left/righthand.dmi

* Moving sheets and ores
 2023-04-25 21:13:02 +02:00
Silverplate
1e3d1dc6d6 Makes Nitrous Oxide Visible on Air Alarm, PDA, and Analyzer (#20891) 
* Makes N2O not a trace gas

* Back end for nitrous readout on air alarm

* Makes nitrous appear on atmosphere scanners

* adds N2O bar to air alarm UI

* adds nitrous to PDA scanner

* TGUI Rebuild
 2023-04-24 19:34:25 +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
ppi13
79a46fa890 Corrects the examine text of portable canisters to be correct to current mechanics (#20887) 
* Fixes an oversight done in commit 8c24a36

* Updates-test-properly
 2023-04-22 09:45:34 +02:00
Ryan
7d72183077 fix (#20882) 2023-04-22 09:45:21 +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
Henri215
25f2c9fda1 You can now ALT+CLICK rotate processors (#20857) 2023-04-22 09:44:06 +02:00
AffectedArc07
938a714024 Adds TD info to world/Topic?status (#20849) 2023-04-22 09:43:59 +02:00
Contrabang
80dffdc225 Adds some crash reports to character loading (#20847) 
* runtime solver

* im stupid and forgot how to use stack trace

* Im stupid and commited the wrong file
 2023-04-22 09:43:45 +02:00
GDN
51ad2070a5 buffs Potassium Iodide (#20845) 2023-04-22 09:43:36 +02:00
Silverplate
0c3a555bd4 Corrects cash input text for arcade machines (#20827) 
* Correct amount shown

* Simplifed as per Syrryan's comment

* corrects grammar when adding 1 credit
 2023-04-22 09:43:29 +02:00
Henri215
33576936dc Adds the AK-814 rifle (#20820) 
* Adds the AK-814 rifle

* lets kill another conflict

* Die conflict!
 2023-04-22 09:30:14 +02:00
Luc
b2fa6060f6 Adds ghost notification when the singularity is (likely) loose. (#20826) 
* let you know when it's (probably) loose

* better checks

* guh

* bwaaah

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

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:29:32 +02:00