cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-27 09:51:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,264 Commits 28 Branches 2 Tags
19a3f768c855a9fa1093fbb007ab6c19be78218e
Commit Graph

22113 Commits

Author SHA1 Message Date
GDN
19a3f768c8 into the bin (#24289) 2024-03-07 11:04:57 +00:00
CRUNCH
d0d3d30d83 Makes the crowbars of non-construction borgs red (#24281) 
* Gives non-engiborgs red crowbars

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

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

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-07 09:33:08 +00:00
HMBGERDO
1d09c090ab Cult offer puts shard in hands instead of dropping on the floor (#24280) 
* shards put in hands

* Update code/game/gamemodes/cult/runes.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-03-07 09:32:36 +00:00
HMBGERDO
8f11c1dfd3 Throwing fix (#24087) 
* non gravity movement, flat second immobilized removed

* let it be

* naming

* Update code/controllers/subsystem/SSthrowing.dm

* Update code/controllers/subsystem/SSthrowing.dm

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

* Revert "Update code/controllers/subsystem/SSthrowing.dm"

This reverts commit 20ef2af351.

* comment update

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-03-06 14:44:46 +00:00
Divulf
e6a147e3da Puts some of the stack crafting code onto the stack recipe datum. (#24252) 
* Puts some of the stack crafting code onto the stack recipe datum to allow for more and easier customization of what happens when a recipe is crafted.

* Very important spacing.

* Better returns.

* Removed \the macro, fixed bug in message that occurs when lacking resources for a construction.

* The do_after() should probably be on do_build()
 2024-03-06 14:42:49 +00:00
GDN
00c0f22788 fixes deleted cultists still being considered cultists (#24336) 2024-03-06 14:28:18 +00:00
cybercapitalism
c22691c295 Adds shards to glass and plasmaglass crafting menu (#24226) 2024-03-06 13:27:50 +00:00
Qwertytoforty
d7c7cacc52 Adds The Qani-Laaca Sensory Computer and mephedrone. Ready for review into merge (#23926) 
* Surely this will not have any critical balance implications

* Apply suggestions from code review

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

* oops

* marm fixes

* fixes signal

* how on earth did I do that

* adds twitch to nanocalcium

* respect armor, lowers throw

* IPC can use, fuck up heartless people

* no crawl slowdown / meth

* *slightly* turns down the drug effect

* renames it will deal with pr desc soon

* finishes it

* rnd version empable

* Apply suggestions from code review

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

* Nerfs twitches visuals, due to a reported novastation bug where the visuals would endlessly stack

* Apply suggestions from code review

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

* C-C-C-Changes

* Epilepsy Warning: Drug has vibrant visual effects!

* safety

* Apply suggestions from code review

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

* removes twitch name, make mix explode

* oops

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-03-06 13:25:38 +00:00
GDN
32e15d26d4 fixes a bogus runtime (#24431) 2024-03-06 13:21:12 +00:00
Charlie Nolan
21d919b644 Removed a few not-useful wrench comments. (#24453) 2024-03-06 13:21:02 +00:00
Charlie Nolan
7ae3bf6747 Stop using \improper improperly. (#24410) 2024-03-03 18:04:52 +00:00
Henri215
c3647a13bf NT Recruiter: Tweaks and replacing gender with DOB (#24132) 
* NT Recruiter: Tweaks and replacing gender with DOB

* extra comma

* adjusting numbers and clown tip

* tgui conflict

* rebuild
 2024-03-03 17:53:44 +00:00
Qwertytoforty
16c1a50f0f nearspace is radioactive again during radstorms (#24375) 2024-03-03 17:51:33 +00:00
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
Zack
f77200af04 Removes unused revival code from revenants (#24305) 
* Revenant can't revive anymore

* fixed a funny space

* Update code/game/gamemodes/miniantags/revenant/revenant.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update code/game/gamemodes/miniantags/revenant/revenant.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-03-01 20:11:16 +00:00
Coolrune206
1937ac2db7 Makes the mousetrap mortar fire armed mousetraps (#24123) 
* makes the mousetrap mortar work

* While you're here...

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-01 20:06:15 +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
CRUNCH
0a2669f708 Welding tools can be used to light other people's cigarettes (#23987) 
* Update welder.dm

You can light other people's cigarettes with welders wooo!

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

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

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

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

* Fix broken expression

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

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

---------

Co-authored-by: Luc <89928798+lewcc@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-03-01 13:29:36 +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
DGamerL
900d19369b Quick and easy replacing (#24352) 2024-03-01 12:47:07 +00:00
Luc
f85c58c082 Clarifies, cleans up auto-autopsy report functionality (#24348) 
* clarifies, cleans up long-neglected autopsy scanner mechanic

* constrain this a bit more

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

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

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-03-01 12:46:41 +00:00
GDN
582b0f29e0 mail now lists the job of the recipient on examine (#24307) 2024-03-01 12:42:30 +00:00
HMBGERDO
96e910ce6b a (#24295) 2024-03-01 12:41:57 +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
Qwertytoforty
2ff3e76216 shock biochip nerfs (#23959) 
* shock biochip nerfs

* kw

* describes it
 2024-03-01 11:39:35 +00:00
Zack
f4447fc133 Update firstaid.dm (#24302) 2024-02-27 18:28:36 -05:00
GDN
26b0cb9dca makes fluff structures able to be deconstructed (#24310) 
* makes fluff structures able to be deconstructed

* Update code/game/objects/structures/fluff.dm

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-02-27 18:25:03 -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
Contrabang
0ee6ec3751 dropping dusters works right (#24330) 2024-02-27 17:26:02 -05:00
Qwertytoforty
772c2d13fe Revival nests description updated, heals hivenoded humans (#24299) 
* revival nests no longer lie and say they can turn humans into eggs

* works on hivenode humans, no longer breaks down humans

* no bitches
 2024-02-27 17:21:23 -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
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
warriorstar-orion
657ea5ac26 allow mountable machines on asteroid walls (#23974) 2024-02-24 18:14:32 +00:00
GDN
5ebefe9fa1 Reworks xenomorphs (#23054) 
* reworks xenomorphs

* part 2 electric boogaloo

* more tweaks

* more tweaks

* lints

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

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

* Update code/modules/surgery/organs/subtypes/xenos.dm

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

* Update code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm

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

* Update code/datums/spells/alien_spells/transfer_plasma.dm

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

* reviews

* sprite fix

* high priority fix

* reverts most alien nerfs

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-24 18:13:31 +00:00
HMBGERDO
ba98eb4d16 Bots refactor (#23550) 
* ugh... bots refactor

* everyone uses pathfind and eyes

* most hunt logic to proc

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

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

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

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

* Sirryan review

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

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

* better var naming i guess?

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* review

* uh oh

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

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

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

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

* return FALSE

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Deniz <66401072+Oyu07@users.noreply.github.com>
 2024-02-21 23:01:48 +00:00
Qwertytoforty
ac32162dbc Adds the razorwire implant. Ready for review into merge (#23911) 
* Please merge 23876 first thanks

* whoops / fix

* she snakes on my case till I

* Apply suggestions from code review

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

* deconflicts, ready for TM

* Update code/_onclick/click.dm

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

* lewcs good to them

* icon move and changes

* almost forgot to save this

* Update augments_arms.dm

* Inverted it, it seems.

* fixes lockers

* razorwire failsafes

* fuck

* razorwire one hand

* removes 2hand implant stuff

* Apply suggestions from code review

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

* s34ns changes

* Vampires can gain blood for a minute from people who succumb

* Revert "Vampires can gain blood for a minute from people who succumb"

This reverts commit 50a3cf87fe.

---------

Co-authored-by: DGamerL <108773801+DGamerL@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-02-21 22:51:33 +00:00
GDN
599f645ccb adds the ability to keybind click() triggers (#23395) 
* adds the ability to keybind click() triggers

* Update code/datums/keybindings/click_keybindings.dm

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

* Update code/_onclick/click.dm

* final fixes

* runtime fix

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-02-21 22:49:28 +00:00
Luc
8335d9958e Makes floorlights only toggleable in help intent (#24135) 2024-02-21 09:10:31 +00:00
DGamerL
b11002b67b Fixes cigars being lightable by everything (#24235) 
* Fixes cigars being lightable by everything

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

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

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

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-02-21 09:04:59 +00:00
Mikhail Dzianishchyts
cc0014e401 Fix putting someone into a machinery with active grab (#24246) 2024-02-20 15:42:11 +00:00
DGamerL
766704700e Refactors the atmos watertank backpack (#24177) 
* Refactors the atmos watertank backpack

* Update code/game/objects/items/weapons/tanks/watertank.dm

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

* Update code/game/objects/items/weapons/tanks/watertank.dm

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

* Adds spans

* Henri review

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-19 19:07:11 +00:00
Zack
ce445b09fe Removes a couple of area's that are no longer being used (#24196) 
* removed a couple of areas

* Update command_areas.dm

* fixed a few things
 2024-02-19 19:06:00 +00:00
Mikhail Dzianishchyts
2efb234bcb Fix item dropping when upgrading camera (#24214) 2024-02-19 14:51:52 +00:00
CRUNCH
1fef009d26 Update taperecorder.dm (#24231) 2024-02-19 14:49:27 +00:00
Henri215
3288816b0c claymore fix (#24221) 2024-02-19 14:48:59 +00:00
BiancaWilkson
6617713438 Cyborg analyzers can see organs again (#24212) 
* swapperooni

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

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

---------

Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
 2024-02-19 14:48:45 +00:00
Arthri
0547e8b1c5 Fix runtime (#23990) 
* Fix runtime

* Always return if timer ID is null

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
 2024-02-19 14:48:20 +00:00
Aylong
ac5add482f [READY] TGUI Input Collection (#23891) 
* List Input refresh

* Modal Alerts

* Text Input

* Number Input

* Split Button

* Renaming

* Alert converts

* Text Input Conversion (Part 1)

And TextArea Autofocus + maxLength

* Text Input Conversion (Part 2)

* AAAAAAAAAAAAAAAAAAAA

* I'm FUCKED

* @GDNgit review changes

* "&#39;" fixes

* Revert TGUI Alert from admin delete

* NumberInput Window size

* CRASH if empty list

* Update code/modules/tgui/tgui_input/list_input.dm

* TGUI Rebuild

* TGUI Rebuild

* Update code/modules/paperwork/faxmachine.dm

* _char

* compile

* Rebuild

---------

Co-authored-by: Aylong <69762909+Aylong220@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-19 11:55:01 +00:00
Zack
0d5986fc5c Fixes Cyberiad Issues (#24131) 
* Area for courtroom

* arrivals done

* fixed VSC

* Pt1

* funny

* Pt2

* Pt3

* light

* PT5

* fixed a issue

* PT6

* code/game/area/ss13_areas/legal_areas.dm

* Update cyberiad.dmm

* Update legal_areas.dm

* fixed what  warriorstar-orion suggested

* removed two more requst consoles

* why do I keep forgetting

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-02-19 11:48:45 +00:00