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

5323 Commits

Author SHA1 Message Date
BiancaWilkson 074da2b796 Datumizes microbatteries (#26900) 
* Datumize microbattery

* comments + feedback when you're revivable

* More comment

* more datumization

* Explaining myself

* Being able to charge while not having a microbattery

* Better comment

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

* Changes proc name to be more accurate

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-10-18 23:30:04 +00:00
Chap c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881) 
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-16 17:46:19 +00:00
Chap b51cc0f31c [PORT/FEATURE] Animated closet doors (#26832) 
* Adds animated closets

* Remove unecessary icon states and fixes secure closets

* Actually fixes secure closets

* Please our linting overlords.

* Fixes non-crate subtypes

* Update code/game/objects/structures/crates_lockers/closets.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

* Moved legacy closet icons to seperate file

* Remove some unused variables

* GC

* Moved to proper destroy

* It's good when code compiles

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-14 14:05:16 +00:00
Aylong 7ed4ef4f76 Light restyling of Boxed Messages and removal of unnecessary CSS styles from chat (#26852) 
* Remove a lot of CSS and make boxed message stylish

* Paint themed boxed message and sort light chat styles

* Remove copyright from chat spans

* Uh oh
 2024-10-10 10:00:40 +00:00
Bm0n 1b25a5b021 Surgery sounds 2: Now with volume mixer! (#26884) 
* fuck it

* these too

* ooops

* i did it again

* moved some vars around

* updates generics

* rematch

* oh shit i think this needs a break

* agh

* wall

* updates comment

* compile after 2 years

* this might break things

* typo fix

* restores surgery sound to default

* Misplaced thingy

* support for some new ghetto surgery changes

* organ2

* Update code/modules/surgery/bones.dm

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

* Update code/modules/surgery/surgery.dm

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

* review change

---------

Signed-off-by: Bm0n <92271472+Bm0n@users.noreply.github.com>
Co-authored-by: Bmon <no@email.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-06 09:40:33 +00:00
Qwertytoforty 44b8f92659 I swear this needs like, a unit test or something (#26965) 2024-10-03 17:54:28 +00:00
Chap 666713eb4d [FIX] Guardian health HUD now updates properly when host health changes (#26818) 
* Guardian health hud now updates properly

* Now with negative numbers!

* New signal

* remove non-functioning proc

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Chap <erwin@lombok.demon.nl>

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-01 16:44:40 +00:00
BiancaWilkson 29309eff51 fixes my math (#26933) 2024-09-29 11:35:24 +00:00
Chap 793efb00df Bola no longer gets thrown even if you already are bola'd (#26909) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-09-26 14:21:50 +00:00
Pedro 80d2d78a9a It works! (#26862) 2024-09-22 23:00:57 +00:00
Contrabang c1c1ef94f5 Fixes the abductor belt having incorrect overlays (#26829) 2024-09-19 10:40:57 +00:00
Coolrune206 fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
Luc 23b4f2837a revenants can now flip tables (#26747) 2024-09-19 02:25:58 +00:00
datlo 20f47a7f40 Adds Syndicate organizations (#24040) 
* framework

* factions and objs done

* objective framework

* remove you_are, implement intro_desc

* assassinate syndi text

* remove extra space

* Apply suggestions from code review

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

* Implement steal items

* Apply suggestions from code review

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

* revert forced escape obj

* rename i var

* readd martyr check

* difficulty defines

* remove discounts

* add electra dynamics

* add hawkmoon

* repath org, add gameplay blurbs

* cuts unnecessary content, add org selection, updates

* move defines

* var names

* update numbers

* set defines, tweaks

* add hijack forced obj

* update L O R E

* remove forgotten todo

* document steal_list

* use initial()

* fix comments move steal objs

* apply code review suggestions

* use pickweight

* flags

* replace hardcoded target jobs by target_department

* comment fix

* incorporate org objectives into delayed objectives

* fix martyr check location

* Remove abuser vocab, debug names for orgs

* readd obj name as user, VV only

* add traitor panel and fix forced objective

* reword ARC objective

* change forced objective to list

* rewrite to US spelling

* Rework objective selection

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* add hunter notification, review stuff

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* fix lists

* Updated captain's sabre typepath

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
 2024-09-12 19:08:21 +00:00
Christasmurf 1f9945ee5f Captain's sabre - Resprite and rebrand (#26592) 
* rapier-rebrand

* extdesc change

* indentation

* Update code/game/objects/items/weapons/melee/melee_misc.dm

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-12 17:24:14 +00:00
Daylight 965b42bf51 [FIX] Cult Shadow Shackles can now cuff people who are missing an arm. (#26707) 
* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
 2024-09-11 17:34:20 +00:00
warriorstar-orion 9a5db8f91e refactor: remove CanPass height arg (#26700) 2024-09-11 14:49:30 +00:00
Charlie Nolan 6c2d43ec5a Re-weighted secondary goals. (#26586) 2024-09-10 22:42:26 +00:00
BiancaWilkson 7555aefd89 Replaces the changeling gamemode with a vampires + changelings gamemode. (#26620) 
* Replaces the changeling gamemode with a vampires + changelings gamemode

* Back up to 15

* Lowercase the bs

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

---------

Signed-off-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-09-09 19:19:30 +00:00
Migratingcocofruit 6f1a90c59d Documents and standardizes power and energy units. Fixes a pulse demon bug. (#26560) 
* Documents units of electrical power storage and production. Defines KJ. SMES properly convert watt ticks to KJ. Pulse demon bugfix

* extra documentation

* corrected pulse watt tick to joule conversion location on the pulse demon code

* oops

* Fixes nomenclature formats

* fixes some comments, consolidates power defines in the power defines file
 2024-09-03 13:13:24 +00:00
PopeDaveThe3th 58c7fa9a0d Fairly Sizable Fed Lore Drop (#26600) 
* the fedening

* Federation -> TSF

* Update outfit_admin.dm

* Update outfit_admin.dm

* i forgor

* few more
 2024-09-03 13:04:56 +00:00
Qwertytoforty 4be3cdeb4c improves tarot card logging (#26618) 
* improves tarot card logging

* Update code/game/gamemodes/wizard/magic_tarot.dm

Co-authored-by: 1080pCat <96908085+1080pCat@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>
 2024-09-03 13:03:09 +00:00
1080pCat 681ad6ca4a You can no longer get abductor rnd level 3+ from 1 (#26598) 2024-08-28 23:59:05 +00:00
chuga-git bef66785ce Makes various things return qdel hints on initialization (#26607) 
* makes apcs destroy properly with a null area

* starts cleanup of initialize failures and hint returns

* Revert "makes apcs destroy properly with a null area"

This reverts commit 9a9175cd37.

* narsie returns qdel hint now

* make lightgeists clean up hud on destroy

* use the proper hud removal proc, but this still fails somehow. god help me.

* missed one

* Apply suggestions from code review

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

---------

Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-28 23:57:15 +00:00
DGamerL 9d2da310e9 Fixes QM having the possibility of becoming a head rev (#26590) 2024-08-24 16:34:19 +00:00
chuga-git 842721470f Makes training nuclear bomb not cause GC failure on Initialize() (#26583) 
* training nuclear bomb now nulls reference to core on Initialize()

* why don't we just make it not create the core in the first place?
 2024-08-24 16:16:52 +00:00
1080pCat 2c0d7bbdd1 Adds extended descriptions to tarot cards. (#26459) 
* Adds extended descritoins to tarot cards.

* formatting and a couple of fixes

* Apply suggestions from code review

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update magic_tarot.dm

* Apply suggestions from code review

Co-authored-by: Adri <33333517+Miraviel@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update magic_tarot.dm

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>

* Update magic_tarot.dm

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* rather be more descriptive with what this does

* Update code/game/gamemodes/wizard/magic_tarot.dm

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

* Update code/game/gamemodes/wizard/magic_tarot.dm

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

* DGL review + formatting that wasn't needed

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Adri <33333517+Miraviel@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-08-20 10:33:06 +00:00
Christasmurf 2506ab6d44 code change (#26545) 2024-08-19 12:08:34 +00:00
Kenionatus 777910d6d2 replace magic numbers related to emp and explosion severity with defines (#26495) 
replace even more magic emp and ex numbers
 2024-08-18 03:11:22 +00:00
chuga-git 75b18b4d3c escape with identity objective now properly assigns new target and updates explanation text (#26501) 2024-08-16 04:03:22 +00:00
chuga-git 567fd0ae35 Stops runtime in cult spirit realm rune when observer doesn't have a mind (#26473) 
* sanity checks observers without minds being trait checked

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>

---------

Signed-off-by: chuga-git <98280110+chuga-git@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-13 09:48:04 +00:00
Burzah c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Qwertytoforty 8f7936ebe5 Fixes a pulse demon bug (#26475) 2024-08-12 16:10:24 +00:00
DGamerL 9083c1a340 Fixes traitor-san (#26468) 2024-08-11 19:48:23 +00:00
warriorstar-orion 2a3a84b438 refactor: Biohazard stats (again) (#26424) 2024-08-08 16:35:12 +00:00
DGamerL 341b693132 Fixes trifecta not handing out objectives properly (#26412) 2024-08-06 23:34:35 +00:00
CRUNCH 7e09585464 Gives Most High-Risk Items Extended Descriptions (#25630) 
* LORE!

* MORE LORE!

* Update code/modules/hydroponics/gene_modder.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update krav_maga.dm

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update nuclearbomb.dm

* Apply suggestions from code review

Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* NAD

* Update teleportation.dm

* Update armor_suits.dm

* Fixing some minor typos for cyborg upgrade flavour text

Throws in some missing apostrophes, capitalisation, and the letter "s."

* Briefcase Full of Cash buff

Increases the amount of cash in the Syndicate Briefcase Full of Cash from 600 Cr to 1000 Cr

* Reverts double-feature PR

* Reverts a broken revert

* Reverting again because Ebba told me to

* And reverting yet again

* Update robot_upgrades.dm

* Apply suggestions from code review

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update documents.dm

* Update magboots.dm

* very minor edits.

* Apply suggestions from code review

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

* update

* Update armor_suits.dm

* Apply suggestions from code review

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

* format

* Update code/modules/hydroponics/gene_modder.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* Update defib.dm

* Update armor_suits.dm

* Apply suggestions from code review

Co-authored-by: Burzah <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: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@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: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-04 08:05:38 +00:00
Spaghetti-bit 6837ea7333 Caterpillars and Nymphs that evolve no longer provide blood to vampires and cannot be culted (#26174) 
* Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires.

* Improves comments and changes the trait name.

* Update code/__HELPERS/trait_helpers.dm

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-03 00:07:33 +00:00
Faron 42c50a5cc5 Minor changes to table frames (#26313) 
* Update table_frames.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 table_frames.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 abduction_gear.dm

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

* Update table_frames.dm

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

* Update table_frames.dm

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

* Update table_frames.dm

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

---------

Signed-off-by: Faron  <171642577+FaronCD@users.noreply.github.com>
 2024-08-01 21:40:08 +00:00
Pedro 4ef7a3eb3d [FIX] Tourist Midround fixes (#26358) 
* Fixing

* Suggestion
 2024-08-01 15:11:53 +00:00
HMBGERDO 5234b6386b Revert attacked_by changes (#26330) 
* t checkout master
Revert "Fixing fulton pack not working (#26153)"

This reverts commit 67353fd62a.

* Revert "Cult magic attacks and attacks on stun mark can now be blocked by shields (#25771)"

This reverts commit 9ea58e1e33.

* Revert "[s] Stunbaton no longer triggers shields twice (#26197)"

This reverts commit cd88b3de88.
 2024-07-31 10:00:00 +00:00
Pedro 81aafadc97 [NEW/REVIEW RDY] Midround Event: Tourist Arrivals (#26084) 
* ebent

* WHYYY

* bobobo

* adds ton of epic stuff

* messages added

* Outfit!

* Indentation! Arrhghg

* Gamemode checks, antag check stuff and outfit changes and tourist icon

* ID icon, random species, gender, hair, a few comments and logs.

* Mirroring review

* Applies suggestion

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Tourist Id's now have linked accounts, code cleaning as per reviews

* Following suggestion

* Apply suggestions as per review

* Addresses the risk of two people having the same account

* Typos and final cleaning

* Checking for jobban/Not showing as tourist on manifest

* Orbit test

* compile

* ebent

* WHYYY

* bobobo

* adds ton of epic stuff

* messages added

* Outfit!

* Indentation! Arrhghg

* Gamemode checks, antag check stuff and outfit changes and tourist icon

* ID icon, random species, gender, hair, a few comments and logs.

* Mirroring review

* Tourist Id's now have linked accounts, code cleaning as per reviews

* Applies suggestion

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>

* Following suggestion

* Apply suggestions as per review

* Addresses the risk of two people having the same account

* Typos and final cleaning

* Checking for jobban/Not showing as tourist on manifest

* Orbit test

* TGUI Bundle Rebuild

* Applies suggestions

---------

Signed-off-by: Pedro <79126660+LetXxx@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-07-30 14:10:08 +00:00
DGamerL 4ad7892bed Makes tarot cards not disappear when not hitting a mob (#25919) 
* ezpz tweak

* Boomerang go brrrr

* Revert "Boomerang go brrrr"

This reverts commit 703b45c628.

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-30 13:58:33 +00:00
DGamerL b497e4c925 Removes a lot of redefined procs (#26186) 
* aaaaaaaaaaaaaaa

* Forgor

* Adds missing /proc/

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-30 13:19:32 +00:00
Spaghetti-bit cbeedfca9f Parrying Refactor, Adding Parrying to Select Two-handed Weapons: Parry This You Filthy Casual! (#26043) 
* Refactors parrying and how parrying is handled. Also gives most of the melee wizard weapons parrying as well as most two handed weapons.

* Forgor the blood spear :)

* Renames `special_parry_condition` to `requires_two_hands`

* Apply suggestions from code review

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

* Update code/datums/components/parry.dm

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

* Apply suggestions from code review

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

* applies suggestion from @lewcc

* Removes the two handed requirement from cult spear as per @Qwerty's request

* Apply suggestions from code review (1/2) from hal

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

* Apply suggestions from code review (2/2)

* ...accidentally removed an icon in `energy_melee_weapons.dm` when I deconflicted stuff. 💀 ready for review.

* Again, variable added back during deconflict. issues resolved.

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

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
 2024-07-30 12:33:02 +00:00
Faron 5a5670c382 Fixes blood spraying from the summoner when a holoparasite is healed (#26310) 
* Update guardian.dm

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

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

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

---------

Signed-off-by: Faron  <171642577+FaronCD@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-07-30 12:32:29 +00:00
DGamerL 0bc4493f06 Fixes replace_objective (#26325) 
* aaaaaaaaaaaaaa

* 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>

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-07-29 15:00:15 +00:00
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
Ryan d4598ae36b Ranged Holoparasites in Scout Form no longer instantly die when flying over the blob (#26275) 
* ranged guardian blob fix

* oop

* Update code/game/gamemodes/miniantags/guardian/types/ranged.dm

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

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-07-26 14:30:20 +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