cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,228 Commits 26 Branches 2 Tags
87a318a7deebf64a8e8f6acd2df5e138f2751e06
Commit Graph

26723 Commits

Author SHA1 Message Date
Contrabang
87a318a7de Refactors screen objects to /atom/movable (#24068) 
* introduce helper + remove unused proc

* we love compatibility

* Update code/_onclick/hud/action_button.dm

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

* Update code/_onclick/hud/action_button.dm

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

* Update code/_onclick/hud/alert.dm

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

* Update code/_onclick/hud/blob_overmind.dm

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

* Update code/_onclick/hud/blob_overmind.dm

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

* Update code/_onclick/hud/blob_overmind.dm

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

* Update code/modules/martial_arts/martial.dm

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

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

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

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

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

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

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

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

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

* Update code/_onclick/hud/screen_objects.dm

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

* Update code/_onclick/hud/screen_objects.dm

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

* Update code/_onclick/hud/screen_objects.dm

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

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

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

* Update code/game/machinery/computer/camera_advanced.dm

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

* Update code/game/machinery/computer/camera_advanced.dm

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

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

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

* Update code/game/mecha/mecha.dm

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

* deconflict

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-03-03 17:37:51 +00:00
BiancaWilkson
cc433a3794 Fixes an exploit with robobrains (#24394) 
* this hurts me more than it hurts you

* me when istype
 2024-03-02 22:43:22 +00:00
GDN
3102e151bf makes last resort work (#24387) 
* makes last resort work

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

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-02 15:34:24 +00:00
Arthri
8844a2ab97 Removes Toxin Damage from Drinking Blood in Virus Culture Bottles (#23968) 
* Make spawned_disease use O-

* Change type to Vh Null

* Make Vh Null not update blood_volume

* Make Vh Null not feed vampires

* Move string to define

* Update code/__DEFINES/reagents_defines.dm

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

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-03-01 23:34:09 +00:00
DGamerL
3792a0f6c7 FINALLY (#24353) 2024-03-01 20:17:34 +00:00
Luc
06f89243f3 Spectral blade now shows orbs, not ghosts (#24124) 
* Implements

* yeah I meant to do this

* this should probably be safer

* alpha

* Add some contingencies

* Update code/modules/mining/lavaland/loot/tendril_loot.dm

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-01 20:07:19 +00:00
warriorstar-orion
0667f20681 move all EOL comments on typepath names to dmdoc (#23928) 
* move all EOL comments on typepath names to dmdoc

* Apply suggestions from code review

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

* Apply suggestions from code review

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 20:05:49 +00:00
HMBGERDO
25996e232a Pepper Spray update (#24033) 
* pepper spray update

* Update code/datums/status_effects/debuffs.dm

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

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

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

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

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

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

* Rurik review

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-01 19:56:03 +00:00
Pierre-Louis
52efa8eac5 Add coordinate janicart pda (#23489) 
* Add janicart coordinates to the Janitor PDA

* Compiled the new TGUI

* TGUI update

* TGUI update

* Space for indent is the evil

* Update code/modules/pda/cart_apps.dm

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

* Update code/modules/pda/cart_apps.dm

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

* Update code/modules/pda/cart_apps.dm

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

* Update code/modules/vehicle/janivehicle.dm

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

* Update tgui/packages/tgui/interfaces/pda/pda_janitor.js

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

* Update code/modules/pda/cart_apps.dm

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

* Update tgui/packages/tgui/interfaces/pda/pda_janitor.js

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

* Update tgui/packages/tgui/interfaces/pda/pda_janitor.js

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

* Update code/modules/pda/cart_apps.dm

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

* TGUI update

---------

Co-authored-by: Pierre-Louis <hernandezpierrelouis@protonmail.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 19:46:58 +00:00
warriorstar-orion
e1614b9ecb Add DMI/JSON export to local client admins. (#23947) 
* Add DMI/JSON export to local client admins.

* switch to log_world, add if paren
 2024-03-01 13:59:56 +00:00
warriorstar-orion
43b3bb0e44 forbid in-DMI icon state name dupes with CI (#22734) 
* forbid in-DMI icon state name dupes with CI

* remove final icon dupes

* use shodancoat item_state
 2024-03-01 13:12:21 +00:00
Octus
805d6acb71 Sleight of Hand, a Bartender Ability (#23234) 
* the start

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

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

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

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

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

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

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

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

* pain

* ITS STILL A WIP

* dones

* Apply suggestions from code review

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

* oh god, this was just a draft, it should be part of the PR

* we dont need this anymore either

* sirrayan request

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

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

* DGL's review

* more of DLG's review

* removes bar judo

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-03-01 13:10:53 +00:00
HMBGERDO
9101bb588e Headslug for everyone + Headslug once per absorb + Cling abilities offline after reviving (#23992) 
* nerf nerf nerf nerf

* cooldown time

* rechargable headslug

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

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

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

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

---------

Co-authored-by: matttheficus <mickusmatthew@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-03-01 12:59:59 +00:00
PopeDaveThe3th
7c0ce05aae Adds names and descriptions to most bullets and ammo boxes (#24363) 
* Adds names and descriptions to most bullets

* Update code/modules/projectiles/ammunition/ammo_boxes.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update ammo_boxes.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* desc updates

* word changes

* Update ammo_casings.dm

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

* Update ammo_casings.dm

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

---------

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-01 12:49:23 +00:00
GDN
5e79ae0f69 fixes xenos being nullspaced in rare situations (#24362) 2024-03-01 12:48:49 +00:00
DGamerL
900d19369b Quick and easy replacing (#24352) 2024-03-01 12:47:07 +00:00
Contrabang
47d294aa22 booyah (#24344) 2024-03-01 12:45:37 +00:00
Kyani
a0a8562dd7 Makes Weeping Angel Conversion Clearer (#24279) 
* Update magic_projectiles.dm

* Update magic_projectiles.dm

actually changed the description to say to kill people

* rewords the transformation message

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

* Removes unnecessary centering

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

* Removes ALL the center tags

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-01 12:40:24 +00:00
cybercapitalism
16127be106 Photos can be burnt with hot items (#24257) 
* burnphoto() now checks for get_heat() instead of requiring lighter

* fuck

* ebba and cinnamon review

* de morgan's law strikes yet again

* switch doafter timer to use seconds constant

* git gui was a mistake and you can't change my mind

* Update code/modules/paperwork/photography.dm

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

* lewc review

* craaaawling iiiin my skiiiiin

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-01 12:39:17 +00:00
Marm
1f3e991b2a Smoke Grenade Module + Blob Buff (#24224) 
* is good for you

* DESCRIPTION

* fix

* Update code/modules/mod/modules/modules_security.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-01 12:38:09 +00:00
Marm
f016100149 But what if I don't want to kill people? Disabler SMG Port. (#24107) 
* i joined the force to help people

* disabler i hardly know her

* Update code/modules/projectiles/ammunition/energy_lens.dm

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

* oops

* Update code/__DEFINES/lighting_defines.dm

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

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

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

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

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

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

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

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

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

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

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

---------

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-03-01 12:03:26 +00:00
Nathan Winters
da34941fae Minor pill/patch application refactor (#23958) 
* Refactor pill/patch application

* I will come back to this
 2024-03-01 11:39:25 +00:00
DGamerL
f5da54ba15 Easy (#24351) 2024-02-28 21:08:00 +00:00
cybercapitalism
a280b87103 Fixes #24198 (#24357) 
* make reinforcing grab only check if mob is restrained

* restrained was false advertising
 2024-02-28 21:07:22 +00:00
Contrabang
491407cea8 Adds a helper for running unit tests locally (#24269) 
* adds a helper for running unit tests locally

* warning error

* okay it should be ready

* this shouldnt be here
 2024-02-27 18:29:24 -05:00
GDN
b7a88c6da4 fixes #24313 (#24315) 2024-02-27 18:27:27 -05:00
DGamerL
5d79d45279 Buffs Carpfu (#24120) 
* Now just test

* Testing was necessary, should work now

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

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

* Fixes bolas not working

* Nullchecks

* Moar nullchecks

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-27 18:25:59 -05:00
Adrer
45ab7264c5 Galoshes no longer runtime when dispensed from a vendor. (#24170) 
* Galoshes no longer runtime when dispensed from a vendor.

* Replaced with guard clause.

* I am going to

* Turn into the joker.

* Removed inconsistent indentation

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-27 18:24:07 -05:00
Qwertytoforty
6910d716dd Adds the modsuit Chameleon Module (#23411) 
* Adds the modsuit Chameleon Module

* Update code/datums/uplink_items/uplink_general.dm

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

* Update code/datums/uplink_items/uplink_general.dm

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

* even clearer

* Update code/datums/uplink_items/uplink_general.dm

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>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-27 18:17:34 -05:00
Mikhail Dzianishchyts
112a606ae2 Allow an empty string when editing records, flavors, OOC notes (#24316) 2024-02-27 18:12:09 -05:00
BiancaWilkson
bca60c17df when the knock is down (#24173) 2024-02-27 17:37:38 -05:00
Christasmurf
7dd4ecf151 Janitorial Drip (#24141) 
* custodial time

* balls ass

* drask glove fix

* drask sleeve adjustment
 2024-02-27 17:37:16 -05:00
Сиротка
cca550e206 ADD: New weapon - Mining Grenade Launcher (#24093) 
* ADD: New weapon - Mining Grenade Launcher

* Update code/game/mecha/equipment/weapons/weapons.dm

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

* Update code/game/mecha/equipment/weapons/weapons.dm

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

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-27 17:36:24 -05:00
Arthri
19758d1c55 Add New Reagents to ChemMaster's Safe List (#23921) 
* Add new safe chemicals

* Remove haloperidol

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
 2024-02-27 17:35:45 -05:00
Adrer
52f65df055 Fixes runtime adding/editing laws in law manager (#24331) 
* Parameter user now is usr rather than src.

* Use ui.user over usr.

* Added needed ui parameter

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-27 17:26:48 -05:00
Charlie Nolan
19cdfcdbef Set the kitten's resting sprite properly. (#24326) 2024-02-27 17:25:24 -05:00
Contrabang
324560e753 fixes judo footer (#24325) 2024-02-27 17:24:55 -05:00
Contrabang
0009a7dfc4 gnarg (#24322) 2024-02-27 17:24:19 -05:00
Deniz
6dc19d2cd6 reverts isspace lmao (#24317) 2024-02-27 17:23:26 -05:00
DGamerL
848ec5a038 Jezus why is this a thing (#24245) 2024-02-27 17:14:16 -05:00
Qwertytoforty
dd8cf5a92c Vampires can now gain blood for a minute after someone succumbs to death (#24236) 
* Vampires can now gain blood for a minute after someone succumbs to death

* Apply suggestions from code review

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

* status effect it

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-27 17:13:54 -05:00
Qwertytoforty
94cefc61f4 Fireballs now always light people on fire on a direct hit (#24225) 
* fireballs now always light people on fire on a direct hit

* 6 stacks
 2024-02-27 17:13:07 -05:00
DGamerL
d0c4dbfab3 Removes insulated pipes and some related variables (#24156) 
* Removes insulated pipes

* Fixes some issues

* This is a better layout

* Removes the datum

* Removes defines

* Sean review
 2024-02-25 11:16:02 +00:00
GDN
5c2f3170f5 [S] fixes a headslug exploit (#24300) 
* fixes headslugs being able to double up on the dead

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-02-24 14:14:00 -06:00
synthtee
9892dd9fe4 Adds craftable and wearable flower crowns (#24248) 
* deja vu! i've just been in this place before

* PLEASE PLEASE WORK. PLEASE PLEASE
 2024-02-24 19:10:38 +00:00
warriorstar-orion
df5c7f1f9a Add directional variants to APC sprites (#24155) 
* Add directional variants to APC sprites.

Provide exhaustive UpdatePaths script for every single APC around.
Run script across all map files.

* add separate directions

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-24 18:35:10 +00:00
Aylong
329398b4f0 Fixes some issues with TGUI Alerts, and Text Input (#24282) 
* Well... maybe that's not better way

* PDA and all_channels encryptionkey

* Alert fixes

* Bad style
 2024-02-24 18:28:26 +00:00
DGamerL
a44f9ca128 (Hopefully) Fixes the runtime where a hallucination tries to pick from an empty list (#24276) 
* This was an RNG PITA to test

* Also does energy sword
 2024-02-24 18:25:24 +00:00
Mikhail Dzianishchyts
b3bec16c2c Fix non-consumable Ahdomai's Eclipse (#24277) 
* Fix non-consumable Ahdomai's Eclipse

* Apply some refactoring

* Better call parent first

* Apply DGamerL suggestions

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-24 18:24:31 +00:00
Mikhail Dzianishchyts
c761b48cef Fix invisible carp hologram for AI (#24264) 
* Fix invisible carp hologram for AI

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

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

* Apply some formatting

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-24 18:21:57 +00:00