cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-11 07:03:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
60,117 Commits 10 Branches 2 Tags
dev-docs-readme
Commit Graph

4369 Commits

Author SHA1 Message Date
DGamerL 098b13bb33 Removes the empty type of /snacks (#26010) 
* Aaaaa it works

* Add updatepaths

* Add unsaved files

* MATTTTT

* Fixes casino

* Fix

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-29 14:46:04 +00:00
Qwertytoforty 26f28cb7e7 A new space ruin, the telecommunications satellite? [100% done, ready for final review] (#25820) 
* THE WORK, IT GOES AND SO IT GOES

* darker yet darker

* more changes

* Almost done, let's post the pr and have some dev people test it out.

* update comment

* small change

* pushing , then we address changes

* Apply suggestions from code review

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

* more progress

* final bar lines

* aditional tweaks

* Update telecomns_returns.dmm

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* Apply suggestions from code review

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

* sirian changes

* emp weakness, light changes

* no runtimes, shoot borgs

* sorry for all the commits just update to master thanks

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* fixes

* fixes pathing. Voices

* removes always spawn

* Apply suggestions from code review

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

* more changes

* requested string change

* Update code/modules/awaymissions/mission_code/ruins/telecomns.dm

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

* lewcs final changes

* Apply suggestions from code review

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-07-25 18:26:14 +00:00
DGamerL 3f8aff4374 Delays handing out of Traitor objectives (#24857) 
* Idk man

* IT WORKS

* SO CLOSE TO GREATNESS

* IT ALL WORKS AAAAAA

* Actually add a random timer

* Oopsie

* Removes empty proc

* Update code/game/gamemodes/traitor/traitor.dm

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>

* Contra requested changes

* Adds randomness to random_time

* Whoops

* Contra + AA Review

* Removes TODO

* Reverts standard mode

* Makes CI not fail

* Removes unused proc

* FUCK

* Fixes a kit bug (Thanks Erik)

* Tourte Review

* Matt review

* Changes text, adds admin logs

* Clarifies the log

* New and improved version!

* Fixes

* Revert "Fixes"

This reverts commit ea29aa92b2.

* Revert "New and improved version!"

This reverts commit ea053f3b94.

* Properly rerolls objectives at handout

* Adds trifecta support

* Contra and Sirryan review

* Forgor this

* Fix CI

* Final fixes

* Update code/game/gamemodes/traitor/traitor.dm

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

* Update code/game/gamemodes/trifecta/trifecta.dm

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

* Steel review

* Wow I was silly

* Less whitespace

* Dumbest bug in a while

* No more lavaland player getting autobalanced

* Streamlines a proc + another fix

* AAAAA FUCK

* Update code/game/gamemodes/objective.dm

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

* Update code/game/gamemodes/objective.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

* Contra review

* Faire review

* Forgor to push this

* Farie + Contra review

* Hal + Contra review

* Uses `replaceobjective` now + Fix

* Farie review

* Farie review

* Farie review 2: electric bogaloo

* Fix

* Update code/game/gamemodes/objective_holder.dm

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

* Contra review

* Update code/game/gamemodes/objective_holder.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2024-07-24 08:09:14 +00:00
DGamerL a04ac32b09 Makes our codebase 1641 ready (#26151) 
* Makes our codebase 1641 ready

* Store variable

* Renames var
 2024-07-22 09:32:48 +00:00
Luc cb4d709c78 Fixes some extraneous spacing in some messages (#26222) 
* clears a bunch of spaces

* oopsie daisy

* Update code/modules/food_and_drinks/food/customizables.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-20 00:15:21 +00:00
HMBGERDO 3e728beb93 Adds Nightvision Chameleon Glasses (#26075) 
* nightvision chameleon googles

* im competent i promise
 2024-07-11 02:24:05 +00:00
BiancaWilkson ec88636e6c Cyborg Damage, Movement, and Power Overhaul (#25252) 
* Adding defines

* More signals for external power

* Gets the reboot working

* renaming a proc

* config stuff

* Working on cyborg movement

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

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

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

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

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

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

* IOSYS where'd you come from

* begon return 0

* VTEC caps slowdown

* Adjusting EMPs

* Funny arm is GONE

* Oh yeah regenerating stamina might be a good thing

* Forgot you could uninstall vtec

* icon machine broke

* Cell-less borgs can enter chargers to stay powered

* oh that was almost bad

* Fixes some logic

* its a surprise tool that will help us later

* Adjusting some numbers

* Adds a sound to go along with the text alarm

* dead things can still charge

* Another logic error

* Xenos too

* sorry linter

* fixes CL

* Slightly more slowdown on stam damage

* neurotoxin won't stun

* SOUNDS!

* 3 flashes to stun instead of 4

* Slightly longer stun

* SPEEDING UP BORGS JUST FOR THE TM SINCE CONFIG DONT WORK

* Keep borgs stunned forever

* Power loss is more dangerous

* Adds a stamina hud to borgs

* Cyborgs now heal up properly

* Removes an outdated comment

* Replacing parts works better now

* EMPs disable components for a brief time

* More missed rebalances

* When you forget to remove debug messages

* WHAT

* Cult magic works + borgs can be silenced

* 2 flashes to stun, flashes confuse now

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Abductors can stun borgs

* Watcher/cyro rays deal stam to brog

* Fixes a rounding error when healing borgs back to full HP

* Fixed span

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

* Fixed whitespace

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

* Guard clausify

* Indents a message

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Update code/modules/mob/living/silicon/robot/component.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* Update code/modules/mob/living/silicon/robot/robot_damage.dm

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>

* that's not what stat does

* No more hardcoded speed, don't TM this branch

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-09 17:44:50 +00:00
DGamerL 4cf6595d12 Makes all playsounds use bools for vary (#26183) 
* Makes all playsounds use `TRUE` for vary

* Same but for `FALSE`
 2024-07-08 23:54:38 +00:00
CRUNCH 13af419214 Fixes Some Minor Grammar Errors That Most People Will Never See (#26138) 
* Update mind.dm

* Update code/datums/mind.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
 2024-07-08 13:01:11 +00:00
Spaghetti-bit 421d7d8286 Emotes now vary in frequency when they are not age based. (#26171) 2024-07-07 13:06:24 +00:00
HMBGERDO 7764d13257 Makes TGUI strip menu size toggleable (#25763) 
* toggleable fullsize strip menu

* name.

* TGUI rebuild

* tgui rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild

* TGUI rebuild
 2024-07-06 08:42:40 +00:00
tipoima 608b4223b9 Adds a traitor rapid healing item: "Hyperregenerative Medipen" (#26033) 
* Adds Hyperregenative Medipen to traitor uplink

* remove rogue pixel

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_traitor.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

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

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>

* Cuts iron, sanguine, and spaceaccil from the medipen

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/uplink_items/uplink_traitor.dm

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

---------

Signed-off-by: tipoima <61978315+tipoima@users.noreply.github.com>
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-06 08:38:17 +00:00
HMBGERDO 8e57d9a40b 10TC!!! (#26076) 2024-07-06 08:33:40 +00:00
DGamerL 1a3a77d42c Replaces the projectile deflect from the titanium push broom with a good parry (#26061) 
* No more reflect, good parry instead

* Remove this too
 2024-07-03 03:50:03 +00:00
chuga-git e4f2f8be80 Fixes runtime with ridable element and adds unit test for bespoke elements (#26111) 
* fixes bespoke elements with default indexes, adds unit test for detecting this

* lewc review
 2024-07-02 20:25:00 +00:00
Qwertytoforty b7049b9223 moves the bullet act outside (#26109) 2024-07-02 00:35:33 +00:00
Qwertytoforty aaad036c7c Only small and tiny simplemobs can go on skateboards, shoot people off them [BALANCE PRE APPROVED] (#26091) 
* Only small and tiny simplemobs can go on skateboards, shoot people off them

* Update code/datums/components/riding/riding_vehicle.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-02 00:14:09 +00:00
HMBGERDO bc303a85bd Adds cult action bar (#26052) 
* cult actions list

* moved blood spear a little to the side

* pixel offset

* Update code/__DEFINES/action_button_defines.dm

Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>

* review

* eh, why not

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: Spaghetti-bit <yumyumkillkill@gmail.com>
 2024-07-01 23:14:45 +00:00
PopeDaveThe3th f64932f1f3 Shuttle Lore Tweaks (#25790) 
* shuttle lore

* some more lore

* Update code/datums/shuttles.dm

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

* Update code/datums/shuttles.dm

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

* Update code/datums/shuttles.dm

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

* removes the extra T

* whoops

* Update code/datums/shuttles.dm

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

* Update shuttles.dm

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@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-07-01 23:14:28 +00:00
Luc 77253c5ae7 Gives Surgical Drapes a Use (#25686) 
* Gives drapes some utility for starting surgeries

* Adds a nice helping of drapes throughout the codebase

* add icon, realize I didn't think that through

* Handles blood with signals

* whoopsie daisy

* range

* how about borgs

* Apply suggestions from code review

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

* burza suggestion

* more dgamer reviews

* Oops

* Update code/modules/surgery/surgery.dm

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

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-01 19:01:17 +00:00
CRUNCH 3721e5328d Armour (#26019) 2024-07-01 18:55:51 +00:00
PopeDaveThe3th aff6d15117 dsword uplink status (#25877) 2024-07-01 18:55:17 +00:00
Gaxeer 32e46c02aa refactor: rename action button appearance related variables and procs to be clearer (#25658) 
* refactor: make action appearance creation more straightforward

* some adjustments

* fix: adjust action icons to refactor
 2024-07-01 02:29:31 +00:00
Faron 340d8a3731 Update to restraints (#25831) 
* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update humanoid.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update human_mob.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update status_effects.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update neutral.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update blood_magic.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abduction_gear.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update abduction_gear.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update code/game/objects/items.dm

Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Woops.

Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update items.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

The consequences of my actions

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update humanoid.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update clothing.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update human_mob.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

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

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update carbon_procs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

* Update handcuffs.dm

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-01 02:14:52 +00:00
DGamerL b4bac5d681 Holoparasites are now discountable (#25943) 
* Discount the parasite!

* Fix testing values

* More testing values gone

* Carp scroll not discountable again
 2024-06-29 18:06:48 +00:00
PollardTheDragon c3f0694bad Drask Traitor Item - Cryoregenerative Enhancer (#25885) 
* Drask Traitor Item - Cryoregenerative Enhancer

* Removed extraneous list

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

* Better Math

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

* Excessive spacing

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

* Comment fix

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

* Cleaner dna logic

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

* Better lore

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

* Better readability on checks

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

* More noticable alert if empty.

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-29 17:54:39 +00:00
warriorstar-orion f1df68f210 Adds the Dorian Casino, a new space ruin. (#25800) 
* Add the Dorian Casino, a new space ruin.

* fix maplint issues

* add area to walls missing it

* Update code/modules/awaymissions/mob_spawn.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: warriorstar-orion <orion@snowfrost.garden>

* just plating under foyer windows

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-29 08:41:33 +00:00
DGamerL efd6f2dfa6 Removes all locate() calls in block() (#25772) 
* Removes all `locate()` calls in `block()`

* Maybe actually push fixes

* Revert bad merge master

* Forgot this one

* Maybe actually push fixes

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 20:33:38 +00:00
chuga-git a423a008e8 Refactors preparePixelProjectile (#25567) 
* preparePixelProjectile now just takes a target and source atom as parameters

* remove commented out code

* ahem

* hopefully fixes null target nonsense in colossus

* those who cannot remember the past are condemned to repeat It

* i just woke up in a cold sweat at 5am in realization

* reverts back to client-view based firing if source is a mob
 2024-06-28 18:12:42 +00:00
Pedro 9a851addbf Pandemic no longer shows heart failure/shock (#25992) 
* Critical/Shock now invisible to pandemic!

* Moved visibility flag to datum
 2024-06-28 03:16:45 +00:00
datlo 882deeff51 Make magic disguises easier to break, reworks its spell cast (#25929) 
* Make magic disguise easier to break

* add hitby

* add signal check

* update comment

* Fix check and update spell description

* Apply suggestions from code review

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

* added signal to atom

* Revert "added signal to atom"

This reverts commit 79e2aa68d8.

* Update code/datums/spells/disguise_self.dm

Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* adress review, add spin casting

* linter fix

* actually fix linters

* i am so dumb

* fix typo

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

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-28 03:16:39 +00:00
chuga-git da42a1c2f6 Refactors throwing (#25946) 
* refactors datum/thrownthing

* cleanup

* lewc review

* calling parent doesn't do anything lmao
 2024-06-26 21:03:51 +00:00
DGamerL ed7782ad4c Adds the oneuse autosurgeon (#25978) 2024-06-26 20:38:53 +00:00
Qwertytoforty f6b8d87e78 Adds sscooters and skateboards [serious pr do not close after AFD] (#24934) 
* WORLD WIDE NOISE

* Makes it pass CI, tweaks values, glass table hoverboard, and railing grinding

* grind on pipes

* https://youtu.be/cTiM1MJ1o7c?feature=shared

* https://youtu.be/Jc6CHI9f6cM?feature=shared

* temporary change for icon conflicts (hopefully)

* 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>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>

* The rest of the fun loving owl

* missed this one

* Apply suggestions from code review

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

* changes

* Apply suggestions from code review

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

* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm

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

* I love stealth conflicts!

* purge lines

* Apply suggestions from code review

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

* Update tg_vehicles.dm

* works works works

* Update code/modules/vehicle/tg_vehicles/tg_vehicles.dm

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-25 21:38:40 +00:00
larentoun 6b70c59c96 Some LWAP (and other scoped weapons) fixes (#25775) 
* can't use lwap from lockers

* active hand flag

* rename SCOPE_CLICK_MIDDLE
 2024-06-25 21:28:18 +00:00
matttheficus 9d1e1ba40e Judo Storage Slots + Changes to Combos (#25659) 
* this might be a lot i dunno

* forgor status for armbar

* armbar tweak

* DGamerL Review

* merge issue fixed
 2024-06-23 10:53:00 +00:00
Luc 32d4a2ecf4 fixes defibs sometimes treating heart attacks instead of death (#25995) 2024-06-22 22:52:18 +00:00
chuga-git eb8e00a01b Fixes wizard blind spell lasting forever (#25964) 
* makes blind not a genetic spell

* pushes blind duration to 30 seconds (from 20), blurry duration to 40 seconds (from 30), reverts back to 1 tile click targeting.
 2024-06-22 22:45:13 +00:00
Qwertytoforty e37c342401 Lowers the universal gun kit to stechkin pricing (#25961) 2024-06-22 22:45:09 +00:00
Qwertytoforty c7d6e83d7e fixes block uptime being 33% instead of 50% (#25917) 
* matt I'm shooting you (not really but)

* also these ones

* fixes cqc
 2024-06-20 11:38:30 +00:00
Contrabang 18b0b09778 adds spawners for NPC zombies (#25873) 
* lmao

* lol

* yes

* yeah sure

* fix

* Apply suggestions from code review

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

* lewc review + duplicate

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-06-20 11:38:23 +00:00
PopeDaveThe3th 2ef31cc6e4 spikethrower price decrease (#25872) 2024-06-20 11:38:20 +00:00
Contrabang 439918fdcc Changelings now get an option to be revived by defibrillator when faking death (#25623) 
* wow

* forgot to push

* oops

* lewc review
 2024-06-12 22:09:40 +00:00
Contrabang a7c273463d More Zombie Tweaks (#25789) 
* lmao

* text fix

* lol
 2024-06-12 22:02:53 +00:00
Luc 3479f84437 Makes mind swapping instant (#25781) 
* shhhhh

* YEAG

* you can now cast it on yourself, and it'll be whispered

* nah the sound is enough

* Update code/datums/spells/mind_transfer.dm

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-12 21:40:03 +00:00
dj-34 173ff7e7d4 Deathsquad buff (#25744) 2024-06-12 19:17:18 +00:00
Daylight 0388f953c5 2 new traitor items: sticky tar applicator and sticky tar grenade (#25529) 
* Update MechaControlConsole.js

* Changes breakout time to 30, refactors ds into s

* Update bot_construction.dm

* Revert "Update bot_construction.dm"

This reverts commit ddba7627dc.

* Revert "Merge branch 'master' of https://github.com/Daylight2/Paradise"

This reverts commit 8f1bc8c6a3, reversing
changes made to ddba7627dc.

* Code works!

* Sprites, uplink, and more!

* More cleanability, sprites, grenade

* Formatting

* New tar sprites!

* forgot this

* How did this even break

* More price tweaks

* Apply suggestions from code review

* Part 2

* One last fix

* Sirryans suggestion

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Part 1 of code review part 2

* Part 2 of code review part 2

* This took many hours too long.  @Daylight2 Part 3 of code review part 2

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

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

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Part 4 of code review part 2

* Forgot to take this out after testing

* Load-bearing whitespace

* Fixes runtime

* Moved, clusterbuster, bugfix

* Apply suggestion from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* Sirryan's Review

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>

* final final commit for real this time v3

---------

Signed-off-by: Daylight <18598676+Daylight2@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-06-12 18:35:47 +00:00
Christasmurf c84349aab3 Yet another Christasmurf bomber jacket PR (dmi split) (#25684) 
* dmisplit

* stinky new instance

* Apply suggestions from code review

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>

---------

Signed-off-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-06-12 18:18:43 +00:00
warriorstar-orion a58d766f72 cleanup hardsuit-related code (#25746) 
* cleanup hardsuit-related code

* kill sprite too
 2024-06-12 18:05:15 +00:00
Hayden Redacted 7cf569aa8c Adds Space Ruin: Rocky Motel (#25611) 
* First publish of the space ruin, finished up most of the decor. Just working on tweaks next

* Further tweaks; added a shuttle, solar array, and cleaning closet

* Update rocky_motel.dmm

* Final touches on the config and description

* Update space_ruins.dm

* added the config file back.

* added a newline to space_ruins.dm

* fixed there being a pair of stacked disposal pipes on top of each other

* implemented changes suggested by warriorstar; fixed area issues, slight redesign, and expansion of solars area

* this config file is the bane of my existence, fixed the example config by adding rocky_motel.dmm

* Update config.toml

* deleted extra disposal pipes

* Update rocky_motel.dmm

* Update rocky_motel.dmm

* adding the suggestions by @warriorstar-orion & @1080pCat

* Update _maps/map_files/RandomRuins/SpaceRuins/rocky_motel.dmm

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>

---------

Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2024-06-12 18:02:23 +00:00