cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 01:11:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
55,923 Commits 28 Branches 2 Tags
ce78b11870a286c152af85139780cfdc01b0ca84
Commit Graph

25475 Commits

Author SHA1 Message Date
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
Henri215
d824cfaeaf Adds false alarm event back into rotation (#20823) 2023-04-22 09:29:26 +02:00
Zelf
de74815c1e drask, grey, kidan (#20817) 2023-04-22 09:29:11 +02:00
1080pCat
d315a74ca5 Adds a funny little message if you focus too hard on a singulo/teslo (#20815) 
* tele thingy

* grammar!

* new singulo message

* clasuse guarded (and more grammar)

* grammar, indentations, removes a useless return

* 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:02 +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
MisterMovie
727e3e7b53 (serious) Fixes (?) the sprite of the honk rifle (#20801) 
* Adds an old sprite for the honkrifle

* Revert "Adds an old sprite for the honkrifle"

This reverts commit 26f04dd735.

* adds an old sprite for the honk rifle
 2023-04-22 09:28:27 +02:00
Zelf
98fe72799f (serious) Resprites a majority of drinks/drink related objects + Adds Lean (#20793) 
* triple cheeseburger mcdonalds

* changing taste_desc of lean
 2023-04-22 09:28:19 +02:00
Henri215
37e9e6f359 Pimpin' ride floor buffer now can be toggled on/off v2 (#20762) 
* Pimpin' ride floor buffer now can be toggled

* Early return
 2023-04-22 09:28:11 +02:00
GDN
bc8aac8aa1 admin announcements now more obviously alert players (#20758) 2023-04-22 09:27:58 +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
ppi13
bcbce645b1 Allows human mobs to alt+click to unlock APC and Air Alarms (#20742) 
* alt+click to unlock airalarms and apc

* Update code/modules/atmospherics/machinery/airalarm.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-04-22 09:18:31 +02:00
GDN
c2176e3598 makes #20471 work (#20739) 2023-04-22 09:18:17 +02:00
Henri215
d65ec2d5e8 Tweaks to greed ruin and die of fate (#20737) 
* Tweaks to greed ruin and die of fate

* Delay between effects

* moved and updaated traitor items

* More tweaks to traitor item list

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

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

* Sirryan review

* Lets decrease the money even more

* experimental KA instead of alien pistol

* emp dmg for machines when interacting

* brainloss

* Code improvment

* forcewall removal

* Turning into a list

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-04-22 09:18:08 +02:00
JimKil3
319046545c organ tweaks and grammar (#20732) 2023-04-22 09:17:52 +02:00