cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 07:12:55 +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
Henri215
6a109ade7f Moves a few sprites out of items.dmi (#23301) 
* fuck you items.dmi

* banhammer
 2023-11-24 15:39:20 +00:00
Octus
bc43bdaf82 Moves voyager.dmi into items.dmi to reduce bloat (#23295) 
* yep

* moved
 2023-11-24 15:38:36 +00:00
Nathan Winters
0bbc523dad Adds colored shoes to loadout, makes satchels craftable (#23293) 
* Add colored shoes to loadout

* Allow crafting of satchels
 2023-11-24 15:38:12 +00:00
Nathan Winters
60ee7e11b7 Lets lockers/crates protect food from ants (#23286) 
* Let lockers prevent ants

* Refactor ants check; exclude closed lockers and cardboard boxes from turf structure check

* Make the structure check more lenient, convert to typecache

* gnarg

* gnarg 2: Electric Boogaloo

* Minor simplification/optimization
 2023-11-24 15:37:20 +00:00
Adrer
f806aed945 Scrubber/pump eject into hand (#23283) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2023-11-24 15:36:40 +00:00
HMBGERDO
53f6b905e6 customised_abstract_text - removed useless check, changed var (#23282) 
* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
 2023-11-24 15:36:24 +00:00
Aylong
c1900f2d4f [TGUI] Input List (#23281) 
* TGUI Input List

* Formatting

* TGUI re-build

* Holopad & Drop Bomb

* Update tgui.bundle.js

* if

* linter

* Mistake

* TGUI input - Barsign

* Review changes
 2023-11-24 15:36:04 +00:00
1080pCat
a854dab973 engi ert buff+little ert buff (#23270) 2023-11-24 15:35:41 +00:00
GDN
11dc93d501 fixes being unable to rename paper (#23269) 
* fixes being unable to rename paper

* Update code/modules/paperwork/paper.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-24 15:35:04 +00:00
1080pCat
bc7356b578 The temperature gun no longer self charges. (#23260) 
* Update special_eguns.dm

* HENRI review, also forgot the to_chat change

* Update special_eguns.dm
 2023-11-24 15:34:25 +00:00
Cocacolagua
4b3a720d96 Removes boxes from the uplink PART 1 (#23189) 
* removes boxes part 1

* shorter desc for nano injector

* yeahsure1

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

* yeahsure2

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

* yeahsure3

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

* ok no more kit

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-11-24 15:33:25 +00:00
Luc
9f9db15c8b Defibs now shock people giving CPR (#23257) 
* defibs now shock people giving CPR

* use isnull instead

* humanoid like me
 2023-11-24 15:33:01 +00:00
Daniel Lenrd
4a3437355e HUDs can now only change status with sufficient ID access (#23086) 
* Added mental to MedHUD

* Made HUDs write based on ID access

* Makes Chamelion secHUD have write access

* adds trailing newline in defines

* med examine spacing adjustment

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

* sec examine spacing adjustment

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

* 0 and 1s

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

* removes the sec_hud_set call, probably a bad idea

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-11-24 15:29:59 +00:00
Adrer
a92428e175 Adds PAI to cargo shuttle blacklist (#23284) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2023-11-22 11:13:48 +01:00
Adrer
a169176829 Make dicebag not a pillbottle subtype. (#23121) 
* Make dicebag not a pillbottle

* Fix all other references

* Map update

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2023-11-21 23:09:03 +00:00
Qwertytoforty
207e35cddf Adds 3 ipc only implants. (#22798) 
* FUCK fix drugs first

* done just wait for prs to be merged (sorry s34n)

* removes uneeded chest implant redifine, repair implant

* Apply suggestions from code review

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

* !human, fluid

* guard variable lisst

* oops

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Update code/modules/surgery/organs/organ_external.dm

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

* Update code/game/objects/items/stacks/nanopaste.dm

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>

* not needed

---------

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>
 2023-11-21 16:19:39 -05:00
DGamerL
7e74694d6e Fixes some issues with patches and pills (#23322) 
* Oops

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-21 13:49:20 -06:00
DGamerL
307120e7d3 Patches and pills are now no longer subtypes of food (#23063) 
* Part 2 - feeding others doesn't work as intended

* Part 3: fixing force feeding

* Fixes patches being wack

* Makes this less ass

* Adds patches to the chemistry bag

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

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

* Some missed patches

* Apply suggestions from code review

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

* Fixes IPC logic

* Henri Review

* Add updatepaths

* Jimkil review

* IPCs now aren't allowed to eat pills and get patch

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

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

* Update code/modules/reagents/reagent_containers/patch.dm

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-11-21 15:37:16 +00:00
Luc
8546a2ca1f fixes acid peels (#23298) 2023-11-21 13:04:01 +00:00
Luc
9384c2a074 Allows roundstart observers to freely use antag HUD without losing respawnability (#23009) 
* First pass

* do away with old antag hud variable

* rework cannotPossess

* some verification + cleanups

* Update code/modules/mob/dead/observer/observer_base.dm

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

* splits up log call

* Slightly refactor proc calls, continuing contra's review

* Log admin

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-21 13:00:13 +00:00
Vi3trice
f70b534aee Tweaks Load Lawset to differentiate between admins and normal players, admins can choose to not change zeroth laws (#22842) 
* Naughty borgs

* I'm warning you

* typo

* Update law_manager.dm
 2023-11-21 12:59:45 +00:00
GDN
4789f00090 makes paper stack burning more consistent (#22849) 
* makes paper stack burning more consistent

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* Update code/modules/paperwork/paper_bundle.dm

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

* reviews

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-11-20 14:26:45 -05:00
GDN
38f765d4dc Gives drones respawnability, improves killing yourself as a drone (#23070) 2023-11-20 14:12:15 -05:00
GDN
eb371c441c makes ancient goliaths only make tendrils if they have a target (#23151) 2023-11-20 14:10:56 -05:00
Adrer
39005bea2b Fixes machine using power from the area it was created in, rather than using the area it is in (#23188) 
* Update machine area when power_change() is called.

* Do not attempt to unregister from null powernet

* Move to wrench and update wrench_acts

* Remove accidental pseudocode

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2023-11-20 14:10:23 -05:00
ppi13
5ac1cc817d Fixes a runtime in mind traits and makes IS_HOLY work versus vampires (#23200) 
* Fixes mind trait runtime

* DGamerL suggested changes

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

* Contrabang  suggested changes

* Contra suggestions and improvements

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-11-20 14:10:04 -05:00
matttheficus
7f02b6859d Contractees Now Lose All Implants + 10 Minute Time if Antagonist (#22856) 
* i love chaos

* contra review

* contra review 2 or something

* comment fix
 2023-11-15 20:40:05 -05:00
Marm
91ef8186a2 Further changeling engoodening: chameleon skin buff. (#23233) 
* engoodening

* oops

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

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

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

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

* fingy print

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

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

* Update code/modules/antagonists/changeling/powers/chameleon_skin.dm

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

* contra review.

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2023-11-15 19:15:28 +00:00
DGamerL
fef021690e Fixes a few runtimes (#23264) 
* The fixes

* This probably has a worse underlying cause

* Update code/modules/paperwork/paper.dm

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

* Cotnra review

* Contra review

* Removes nullcheck

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-11-15 12:01:55 -05:00
Tom Heeren
5e7e0f348b removes the 'is' from the set-pose command (#23190) 
* removes the 'is' from the set-pose command

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

This commit mandates Lewcc to complete dark chasm with cresselia and the worst starter characters

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-11-14 13:39:51 +00:00
Сиротка
fb2a51da53 Reason text for sentience potion (#23139) 
* Reason text for sentience potion

* Update code/controllers/subsystem/SSghost_spawns.dm

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

* Update code/modules/research/xenobiology/xenobiology.dm

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

* Update code/controllers/subsystem/SSghost_spawns.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-11-14 13:16:30 +00:00
Adrer
802ab71c02 Adds a confirmation prompt to all OOC events in the secrets panel. (#22959) 
* Secret confirmation prompt

* Update code/modules/admin/topic.dm

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

* Added confirmation promts

* Requested change

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-14 13:02:19 +00:00
DGamerL
291daafb46 Potato batteries now have a minimum max charge of 1 (#23159) 
* Easy fix

* Wrong fucking proc
 2023-11-14 12:51:42 +00:00
1080pCat
e2ffb8a882 Engineering borg nerf (just their decompiler ;p) (#23227) 
* Engi borg nerf

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

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

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

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

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

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

* Update code/modules/food_and_drinks/drinks/drinks/bottle.dm

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

* Update code/modules/mob/living/simple_animal/friendly/lizard.dm

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

* Update code/modules/projectiles/ammunition.dm

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

* Update code/modules/reagents/reagent_containers/chemical_bottle.dm

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

* Update lighters.dm

* Update spiders.dm

* reverts some that maybe should stay

* oops

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-11-14 12:51:13 +00:00
DGamerL
f55d619fd6 Fixes PDAs not dropping when being stripped (#23245) 
* Truly amazing what uncommenting can do

* Belts aren't dropped now aswell

* Nullchecks
 2023-11-14 12:50:55 +00:00
Christasmurf
060149ca7c armband and stuff (#23224) 2023-11-14 12:46:57 +00:00
Henri215
efb070c71e wormhole resprite (#23226) 2023-11-14 12:46:39 +00:00
DGamerL
09181bb061 Buffs the Prince of Terror (#22421) 
* The fast prince of belair

* The charging prince of belair

* Lewc review

* Update code/modules/mob/living/simple_animal/hostile/terror_spiders/prince.dm

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

* Sean review

* Sirryan Review

* Range is now 9 for widescreen

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-13 18:16:38 +00:00
Daniel Lenrd
370adae9cf Allows All Silicons to do Paperwork (#22653) 
* Silicons Paper Printing

* the CI OD fix

* Revert "the CI OD fix"

This reverts commit d223e056c1.

* This should fix it

* Add files via upload

* Test TGUI Fix 1

* Empty Commit

* Recompile TGUI with checkout

* toner code early return

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

* using right variable names

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

* adding argument to text function

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

* New code testing

* ui.user usage

* Used the new cooldown declarations

* Automatic TGUI Prettifier

* TGUI 10

* Recomplie TGUI

* TGUI 11

* Try to fix TGUI

* remove extra divider

* Revert "remove extra divider"

This reverts commit e7faaa4b4d.

* Use empty fragment instead of divider

* compile TGUI

* Compile TGUI

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-11-13 12:14:30 +00:00
Contrabang
9cd84512a0 Makes some alterations to the APC CI (#23166) 
* woohoo

* Update code/modules/unit_tests/areas_apcs.dm
 2023-11-12 21:00:00 +00:00
Contrabang
48d7b00a0d CI now bans the use of weird spacing in conditionals (#22777) 
* no more spaces

* Matthew 10:22

* fixes

* dgamerl review

* Update code/modules/hydroponics/plant_genes.dm

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

* Update code/modules/mob/living/simple_animal/bot/ed209bot.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/mob/mob.dm

* Update code/modules/pda/PDA.dm

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

* fuck

* bah

* Update tools/ci/check_grep2.py

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

* oops

* guh

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-11-12 20:59:43 +00:00
GDN
35754c77ea Verb cleanup (#22224) 
* Verb cleanup

* rest of the object verbs

* little more object cleanup

* more changes

* last of it

* this too

* tgui

* code review

* time to go
 2023-11-12 20:19:17 +00:00
Sadhorizon
f65d120711 Nerfs the basic plasma cutter. Yep. (#23071) 
* Who would ever expect a basic cutter nerf?

* temporary paramedic fix - they get a drill
 2023-11-12 20:11:34 +00:00
Marm
c26462836f zzzzz (#23220) 2023-11-12 20:10:03 +00:00
Aylong
d2058c57cd Fix: Some invisible food sprites (#23214) 2023-11-12 20:05:59 +00:00
Qwertytoforty
6525351d31 Removes the IPC damage mod. For real this time. (#23178) 2023-11-12 20:04:09 +00:00
DGamerL
0e18a8e11d Qwerty_Whoops (#23170) 2023-11-12 19:46:03 +00:00
DGamerL
378630370f Refactors custom_pain to work on organs instead of on mobs (#23160) 
* Wolf request

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

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2023-11-12 19:45:26 +00:00
dj-34
46b4b22563 Fix: change waterfall drip recursive timer to loop one (#23149) 2023-11-12 19:44:52 +00:00
Henri215
95450a371a Bicycle is now a bicycle! (and gives it a bicycle bell too) (#22619) 
* ring ring, looks whats coming

* typo

* becoming a REAL vehicle

* more tweaks!

* newer sprite version

* Useless

* bicycle sprite
 2023-11-12 19:43:35 +00:00