cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-28 02:11:45 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,120 Commits 28 Branches 2 Tags
0d5986fc5cfcf51b121da234dee4054ec466f2dd
Commit Graph

10567 Commits

Author SHA1 Message Date
Marm
9d4e87eaac Nerfs Botany Maximum Yield + Plant Bags (#24122) 
* we're so back not dying instantly bros

* it  came to me in a dream

* Update code/game/objects/items/weapons/storage/bags.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-19 11:44:06 +00:00
warriorstar-orion
1f7c85511c remove 'game kit' deadcode object and icon (#24161) 2024-02-19 11:41:37 +00:00
Qwertytoforty
bc5f3de1cf [s] blocks all teleport sources from infinite looping, reverts 24191 (#24213) 
* [s] blocks all teleport sources from infinite looping, reverts 24191

* defines it

* renames

* Update teleporter.dm

* drops icon

* Update code/game/machinery/teleporter.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/effects/portals.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/objects/effects/portals.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Update code/game/machinery/teleporter.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-17 21:54:25 -05:00
GDN
883fd6881d camera bugs now stick to things they're thrown at (#24053) 
* Implements camera fu

* camera bugs now stick on things they're thrown at

* removes dupe code
 2024-02-17 14:30:34 -05:00
Luc
021756999d Adds a global spark limit (#24197) 
* Adds a global spark limit

* spacing

* Moves logic into when the effect is actually generated

* don't want this kicking around

* spacing

* oops
 2024-02-17 14:20:03 +00:00
DGamerL
3cc85db9a3 I am shrimply amazed (#24189) 2024-02-15 23:56:26 -06:00
Adrer
c120721cde Fixes agent ID being uneditable (#24182) 
* Use the proper input proc in the agent ID

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-15 12:38:32 -05:00
GDN
82b863cefd Converts over the missing TGUI input lists (#23859) 
* Converts over the missing TGUI input lists

* last fixes

* num revert
 2024-02-14 21:17:29 +00:00
GDN
13a2630028 Removes comparisons to true and false (#24083) 
* Removes comparisons to true and false

* Update .github/CONTRIBUTING.md

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-14 19:45:37 +00:00
CRUNCH
97cfc533b2 Allows toolbelts to hold nanopaste and cyborg analyzers. (#24051) 
* Update belt.dm

Store nanopaste in toolbelts.

* Update belt.dm

can hold cyborg analyzers too!
 2024-02-14 19:43:52 +00:00
Zack
a268af22ef Puts evidence secure lockers in evidence room in brig on Cerestation, delta, meta and on box station (#24037) 
* Secure lockers

* guh random APC

* secure safes

* fixed a issue

* Update security_lockers.dm

* Secure evidence lockers

* Update security_lockers.dm

* Update code/game/objects/structures/crates_lockers/closets/secure/security_lockers.dm

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

* Update security_lockers.dm

* evidence lockers for the dective

* fixed a funny error

* fixed a few issues

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-13 19:17:28 +00:00
DGamerL
60dadf48fe Makes the VTEC subtract 1 speed instead of setting it to -1 [NPFC] (#24104) 
* Dear god why didn't we think of this before

* Remove extra space
 2024-02-08 21:13:22 +00:00
Qwertytoforty
c398e4a617 Adds 2 cybernetic implants, makes emag_act return TRUE (#23876) 
* Adds 2 cybernetic implants, makes emag_act return TRUE

* the rest of the fucking owl

* yeah that would do it

* remove this

* Apply suggestions from code review

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

* request changes, scaling burn damage, 3 tile range, lowers tech level

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update code/game/objects/structures/crates_lockers/crates.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* Update scanners.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Apply suggestions from code review

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

* Lewcs good to them?

* Apply suggestions from code review

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

* fuck me

* there are no message admins in ba-sing

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-08 12:52:11 +00:00
Marm
3c5cb36e81 Adds Construction Bag (#24067) 
* imagine actually building things?

* Update code/game/objects/items/weapons/storage/bags.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-08 12:50:40 +00:00
Contrabang
848c717771 More CI for conditionals (#24050) 
* yay

* and thus, it was fixed

* and this fix too, so that the lang server stops complaining

* warrior review
 2024-02-06 18:29:33 +00:00
Zack
4219e9dbcd Changed airlocks to airlock helpers on NSS, Kerberos, NSS Cyberiad, NSS Cerebron (#23634) 
* airlockhelpers

* did some things

* fuck you doors

* Guh merge conflict

* guh

* pipe layer

* pipes

* Update delta.dmm

* Shit my shoes are untied

* Update delta.dmm

* catewalks

* fixed what warriorstar-orion suggested

* git reset --hard HEAD~1

* fixed what warriorstar-orion commented

* guh random sign

* Fixed what S34N suggested

* added two things

* fixed a oopps

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-06 14:02:22 +00:00
Qwertytoforty
782290cd62 fixes a very hilarious grey autocloner bug (#24038) 
* fixes a very hillarious grey autocloner bug

* actually move it here so languages are kept
 2024-02-05 21:56:33 -05:00
warriorstar-orion
ed9842b730 remove most top-level vardecls (#23946) 2024-02-05 17:12:08 -05:00
TheKillfish
84dff25289 Adding Improvements to Knuckledusters (#23902) 
* First tweaks to the dusty bois

* Better code comment

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

* Managed to finish my checklist of things

* Didn't like the flag name, and finished it's descriptor comment

* Nevermind, flag was not needed

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-04 22:12:38 +00:00
Qwertytoforty
a31a1aafa1 Abductors can not be recalled for 10 seconds after beaming down (#23849) 2024-02-04 21:52:59 +00:00
datlo
17e58231df Adds the pondering orb to the wizard den (#23861) 
* Pondering orb

* fix

* reset map

* map merge fix test

* Update centcomm.dmm

* Revert "Update centcomm.dmm"

This reverts commit 1ff1a91c80.

* Revert "map merge fix test"

This reverts commit 0b4a71a365.

* update map

* Apply suggestions from code review

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

* make ghostify more generic

* add proximity check

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-04 21:47:09 +00:00
Qwertytoforty
5dd3f7fb79 stimulants now use stun absorb, flashes no longer makes stun immune people drop items (#23850) 
* stimulants now use stun absorb, flashes no longer makes stun immune people drop items

* whoops need this

* and this

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-04 21:45:40 +00:00
1080pCat
a2ff8ada2d Fixes railings mentioning tables on inspect. (#23554) 
* teehee

* cinnamonsnowball review

* contra review

* Update railings.dm

* Update code/game/objects/structures.dm

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

* Apply suggestions from code review

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-04 21:37:16 +00:00
datlo
97f46ffe84 Refactor and rework the staff of chaos (#23472) 
* [WIP] Refactor and rework the staff of chaos

* update lists

* Add trick weapons

* rename damaging effect, more stuff

* add chaos wand

* implement gift spawning, css, disco, wand

* string tweaks, prank toys

* tweaks + bonus soul

* tweak

* add prank revolver

* fix

* tweak

* implement lethal effects + tweaks

* string tweaks

* implement negative effects

* implement remaining effects

* remove leftovers

* non carbon handling

* non-human handling

* wand human check

* clean up

* Balance

* remove test comment

* remove debug chaos items

* add message to dead check

* clean leftovers

* review suggestions

* Update code/modules/projectiles/guns/chaos_bolt.dm

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

* Apply suggestions from review

* oh and that one too

* Update code/modules/projectiles/guns/projectile/revolver.dm

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

* documentation fix

for some reason chaos_bolt has a bunch of changes not in the git

* add css classes

* recompile css, fix food

* recompile tgui

* Apply suggestions from code review

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

* invoke async proc ref

* adress code review

* fix conflict

* rename var

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-04 21:32:10 +00:00
Qwertytoforty
a2a804225c Adjust supermatter mole crush / changes out cryo anomalies / sm zap power gen. (#23843) 
* Supermatter generates zap power properly. Introduces mole stability period. Fixes SM darkness

* removes darkness fix
 2024-02-04 21:19:15 +00:00
Mikhail Dzianishchyts
19730f6e81 Fix tint control logic (#23821) 
* Fix: Upgrade tint control logic

* Follow formatting

* Remove redundant 'as'

* Revert "Remove redundant 'as'"

This reverts commit 12bceb4053.

* Auto-docs, refactoring
 2024-02-04 21:18:43 +00:00
AffectedArc07
3ab2a08d86 [TM prolly] Some init optimisationss (#23800) 
* [TM prolly] Some init optimisationss

* Do this as well

* Sod it some runtime optimisations as well
 2024-02-04 21:17:50 +00:00
HMBGERDO
ecc109915a Stamina damage no longer bypass some checks (#23447) 
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
 2024-02-04 21:15:20 +00:00
Qwertytoforty
257692d6df 1, 2, 3, ah ah ah (#24001) 2024-01-30 21:14:44 +00:00
Qwertytoforty
7a3acefd9d weak ions no longer coin flip into heavy emps (#23864) 
* weak ions no longer coin flip into heavy emps

* haha very funny why is that there fuck off
 2024-01-30 14:47:05 +00:00
Varelion
769d07dbf2 TRAIT_TABLE_LEAP Checks Added To under_siege Judo (#23905) 
* Create reagent vomicilin

* Update vomicilin

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

Updating as suggested.

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Revert vomicilin

* Revert vomicilin

* Revert vomicilin

* Add the ability to create droppers from glass

* Add TRAIT_TABLE_LEAP checks to under_siege judo

* Finalize requested changes

* Update code/__HELPERS/trait_helpers.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-01-30 14:44:25 +00:00
DGamerL
d947afe374 Should be done (#23817) 2024-01-30 14:43:06 +00:00
firstghost
c2d3489869 Spray bottle to autolathe (#23725) 
* Spray bottle to autolathe

* Update code/modules/research/designs/autolathe_designs.dm

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

* Update spray.dm

* Update autolathe_designs.dm

* Increase spray bottle cost

2000 metal and 5000 glass

* Add plastic variant recipe

6 sheets

* Update code/game/objects/items/stacks/sheets/sheet_types.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-01-30 14:42:07 +00:00
Contrabang
243ff18304 Maint drones now return to the drone manufacturer when shutdown (#23367) 
* luv me some drones

* uhhh WIP

* ..() moment

* Gaxeer review & misc change

* henri review

* tgui

* boom, i think

* oops

* sirryan review

* final stuff

* lmaooo

* Apply suggestions from code review

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>

---------

Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-01-30 14:39:46 +00:00
1080pCat
2226231caf Ports the airlock bolt wrench from /tg/ station. (#23614) 
* bolterwrench

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

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

* Update code/game/objects/items/tools/wrench.dm

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

* Update code/modules/research/designs/equipment_designs.dm

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

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>

* most of lewc reviews

* i think this is what lewcc meant.

* Update airlock.dm

* Update code/modules/research/designs/equipment_designs.dm

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

* lewc review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-01-29 18:17:20 -05:00
Deniz
38d7f87e9f surgical tray is bulky (#23899) 2024-01-28 17:09:14 -05:00
HMBGERDO
80f1b0d113 Extinguisher and spray bottle works on tile you're standing fix (#23914) 
* extinguisher once again works on yourself

* you too
 2024-01-28 13:27:03 +00:00
dj-34
010aec7f50 Fix stacks dupe and ore duping with BS crystals (#23948) 2024-01-26 19:23:20 +00:00
S34N
17a68e9242 Revert "[FIX] Jobbaned Roles at poll_candidates" (#23927) 2024-01-26 20:12:20 +01:00
DGamerL
80f6170270 Small QOL improvement for (bluespace) light replacers (#23826) 
* Neat

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

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

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

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

* Lewc review

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-01-25 15:18:47 -05:00
BiancaWilkson
6a11049bca Robotic Analyzer Buff + Cleanup (#23523) 
* analyzing robots

* how can it analyze the reagents of organics

* they may be snowflakes but theyre special to me

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

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

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

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

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

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

* whoopsies

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-01-25 14:34:58 -05:00
Henri215
151a3b965e Fixes the metal foam box sprite being invisible (#23888) 2024-01-25 14:24:37 -05:00
warriorstar-orion
f8a55e7178 Remove unused 'salvage captain' ID and related areas (#23822) 
* Remove unused 'salvage captain' ID

* Just remove as it was never used
 2024-01-25 14:24:03 -05:00
Henri215
4237f77be1 Fixing a few grammar issues (#23842) 
* fixing some typos and spacings

* another one

* not that one

* even more
 2024-01-25 11:44:38 -06:00
PhantornRU
867da454c6 Jobbaned Roles at poll_candidates (#23847) 2024-01-25 11:41:35 -06:00
DGamerL
79a7558df7 Revives Organ Datumization (#23397) 
* first runthrough lol

* okay make this shit actually work

* nerfs slime people

* fixes

* more changes

* fix

* bim bim bam bam

* ok back in the head becuz i dont give a shit

* Sirryan review

* Sirryan review

* Fixes CI

* Stealthy CI fail

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-01-21 22:23:51 +00:00
GDN
0b8c196f67 tgchat day zero changes (#23872) 
* tgchat day zero changes

* Update code/game/verbs/ooc.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 22:07:57 +00:00
PopGamer46
939c09431e IPC ghetto oversight fix (#23794) 2024-01-21 21:30:24 +00:00
Divulf
47a1207b15 Gives flares the same attack sound and attack verbs as lighters. (#23782) 
* Gives flares lighter sounds and attack verb.

* Null is bad.

* initial() is also bad.
 2024-01-21 21:28:08 +00:00
Qwertytoforty
6a49c04a6c fix eswords / cleaving saws not being sharpenable (#23779) 
* fix eswords / cleaving saws not being sharpenable

* need that

* ok cut that out so it works again

* extra bracket
 2024-01-21 21:27:01 +00:00