cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-22 23:43:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,167 Commits 29 Branches 2 Tags
d0c4dbfab390291aed5e1e2eea98cd03027e487b
Commit Graph

42977 Commits

Author SHA1 Message Date
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
Qwertytoforty
4e905c0e92 Alternate fix to 24241. TM PLEASE (#24243) 
* Alternate fix to 24241

* no commament

* no free chances

* one more shift

* contras changes

* dgammers changes

* list it
 2024-02-24 18:30:49 +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
Qwertytoforty
4aa06a90d2 I don't want to talk about it (#24286) 2024-02-24 18:23:41 +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
DGamerL
c41a803b9c Refactors one ventcrawl proc and fixes a bug (#24215) 
* Refactoring and fixing a bug

* GDN review

* Contra review
 2024-02-24 18:20:55 +00:00
DGamerL
09ab95abdc Adds teslium (#24117) 2024-02-24 18:16:55 +00:00
13spacemen
fc52cf014a Repairs Vox Tail/Chest/Groin Sprites, Renames Skin Tones (#24097) 
* repaired green tail e/w, changed green tail w to be mirror of e, added a proper green tail s sprite, repaired green chest e/w
added proper tail markings s sprites, tail markings w is now a mirror of e

* all vox tails done

* repaired all vox chests and groins

* replace all female torso/groin

* fixes more issues with vox tail sprites

* final sprite fixes for vox tails and tail markings, renamed "band" to "bands", deleted unused tail markings file
renamed vox "green" skin tone to "lime"
renamed vox "dark green" skin tone to "plum"

* edit icon_skin_tones
 2024-02-24 18:15:27 +00:00
HMBGERDO
ac7752f6dc Rounds all organ health damage to the second decimal (#24031) 
* no more stupid values

* internal organs too

* 2 symbols

* var

* Empty-Commit
 2024-02-24 18:14:47 +00:00
warriorstar-orion
657ea5ac26 allow mountable machines on asteroid walls (#23974) 2024-02-24 18:14:32 +00:00
Aylong
f2223bb122 TGUI Input fixes (#24270) 
* Some tgui input fixes and reverts

Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs

* Some tgui input fixes and reverts

Add default to suit sensors and beaker transfer amount.
Revert languages list and paper text inputs

* Meh
 2024-02-24 18:14:03 +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
GDN
335199b55b fixes new players getting an unusable verb (#24251) 2024-02-21 09:08:23 +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
DGamerL
e807de3d07 Easy fix (#24160) 2024-02-19 19:06:26 +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
Mikhail Dzianishchyts
6811e20588 Don't pick the color of cable_coil/random when splitting a stack (#24218) 
* Don't pick the color of `cable_coil/random` when splitting a stack

* Update code/modules/power/cables/cable_coil.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-02-19 14:51:13 +00:00
CRUNCH
1fef009d26 Update taperecorder.dm (#24231) 2024-02-19 14:49:27 +00:00
DGamerL
42f23e73bb Fixes "????" making you vomit more than normal (#24230) 
* Dummy disease check

* Contra review

* Update code/datums/diseases/advance/advance.dm

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

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-02-19 14:49:14 +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
Adrer
4a1b8af808 Moves the kinesis screen effect to a seperate file (#24111) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-19 11:44:25 +00:00
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
Luc
b279d3bd4a Shotglasses now go down in one sip (#24134) 
* Shotglasses now actually let you shoot them down

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

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

* thanks snowball

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-02-19 11:43:40 +00:00
Deniz
a77eac915a process_type fix (#24136) 2024-02-19 11:43:17 +00:00
tristan1333
498551ad1f Combat Baguette now bonks correctly (#24148) 
* Food with harm intent and force go bonk

Fixes combat baguettes not bonking

* Update code/modules/food_and_drinks/food/snacks.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:42:46 +00:00
Deniz
fb75c9ae65 Fixed emagged secbots being broken (#24149) 
* emagged == 2 begone

* one slipped by
 2024-02-19 11:42:24 +00:00
GDN
d72d0aebb7 Removes unneeded verb settings (#24152) 2024-02-19 11:42:11 +00:00
Contrabang
0ee8a53eec i love runtime fixes (#24159) 2024-02-19 11:41:50 +00:00
warriorstar-orion
1f7c85511c remove 'game kit' deadcode object and icon (#24161) 2024-02-19 11:41:37 +00:00
Adrer
ffa697f6c5 Fixes invisible suits on Grey, Kidan and Drask (#24169) 
* Fixes invisible suits

* Update code/modules/clothing/suits/misc_suits.dm

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

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-02-19 11:41:13 +00:00
Adrer
9064b6e7b2 Evidence bag now respects nodrop (#24171) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-19 11:40:46 +00:00
Adrer
6b57a61b00 Properly pass shock source to electrocute proc (#24180) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-02-19 11:39:59 +00:00
Henri215
aa3124a4fc Removes one map area that was not being utilized (#24186) 2024-02-19 11:39:41 +00:00
Adrer
47a288f5a6 Cyborg now always updates damage when taking damage (#24194) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-02-19 11:39:16 +00:00