cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity
63,806 Commits 14 Branches 2 Tags
nanomap-render
Commit Graph
232 Commits
Author SHA1 Message Date
AlanGitHubCRUNCH
 		6a83c1ad67 Migrate two-handed weapons to the new attack chain. (#32313) 
* Migrate two-handed weapons to the new attack chain.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Separate two-handed weapons into several files in their own folder.

* Formatting tweaks.

* Apply suggestions from CRUNCH review.

* Include paradise.dme.

* Migrate a bit more, clean up a bit more.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Hopefully resolve CRLF error.

* Define some variables.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestions from CRUNCH review

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Fix supermatter halberd dusting condition, spelling errors.

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* GITHUB NO. PUT THAT BACK.

* Fix pyro claws door force.

* Restore the coveted trailing newline.

* Apply suggestion from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Migrate bo staff to the two handed folder and new attack chain.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
 2026-08-12 23:23:39 +00:00
CRUNCHGitHubDGamerL
 		bec388228b Migrates /obj/item/clothing to the New Attack Chain (#31421) 
* the beginning of my torment

* This was a very small piece of torment

* God agghhghhhh the suffering

* pain and suffering and destruction

* Update bot_construction.dm

* Update heretic_necks.dm

* Update heretic_armor.dm

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Apply suggestion from @DGamerL

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2026-02-09 19:36:38 +00:00
CRUNCHandGitHub da1ebd039d Adds Materials to Every Autolathe and Protolathe Item (except for ammo boxes, IK mags, and Dart Boxes) (#31445) 
* Holy fuck there's so much shit I'm not even done

* oh god there's so many

* it is done

* Update autolathe_designs.dm

* Update circuitboard.dm
 2026-01-30 21:25:40 +00:00
ToasticalandGitHub 4c74b78a18 migrate all /obj/item from /New() to /Initialize() (#31232) 
* migrate all /obj/item from /New() to /Initialize()

* move GLOB.chemical_reagents_list creation to /world/New()

* review

* oops

* autodoc a smart var
 2026-01-28 19:44:32 +00:00
CRUNCHGitHubkyunkyunkyunDGamerL
 		ee13dce3e1 Borg Push Broom Icon Updates When Braced (#31255) 
* broom

* Apply suggestions from code review

Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>

* Update code/game/objects/items/robot/robot_items.dm

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

---------

Signed-off-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2025-12-27 09:35:27 +00:00
kyunkyunkyunandGitHub b0463d3c83 Convert most spans to defines (#31080) 
* spanish?

* aaaagain

* keep maptext

* Update robot_items.dm

* Update span_defines.dm

* compiles

* Update silicon_mob.dm

* compile
 2025-12-13 23:55:48 +00:00
kyunkyunkyunGitHubMason
 		9b095a559d Remove (almost) unused var/item_color from /obj/item (#30453) 
* it's black and white

* Update soft_caps.dm

* bruh

* bruh

* tweaks

* comment

* Update abduction_gear.dm

* Update paradise.dme

* Update paradise.dme

* Update paradise.dme

---------

Co-authored-by: Mason <116982774+Burzah@users.noreply.github.com>
 2025-10-06 17:59:46 +00:00
kyunkyunkyunandGitHub 8821ab9a66 Updates a couple of /obj/item variables (#29829) 
* compiles checkpoint

* fix some

* updatepaths

* fix

* rrr

* linters

* fiexs

* icon fixes

* plasmemes

* fix

* fix

* fix bit more

* fix

* well

* cleanup

* fix glasses layer

* conflict

* fuck gun code

* fixes

* fix

* fixes to energy guns

* review

* conflict

* support that 1 unathi pixel

* fix
 2025-09-14 15:23:56 +00:00
kyunkyunkyunGitHubPollardTheDragon
 		626eaaeb79 Removes british spelling of armor from armor_penetration vars (#30104) 
* spelling

* manually rename last armour pen

* Update code/game/objects/obj_defense.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm

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

* Update goldgrub.dm

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
 2025-09-01 04:27:52 +00:00
PopeDaveThe3thandGitHub 8974bf7c30 [LORE] Cybersun Lore Polishing + Small Implant Updates (#29350) 
* sun

* spelling mistake

* changes

* a

* who up

* review

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-08-05 15:24:48 +00:00
ContrabangandGitHub 1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
kyunkyunkyunGitHubLuc
 		75202c986e Fix and refactor of chainsaws (#28893) 
* code improvements

* linters

* oh

* Update spellblade.dm

* Update spellblade.dm

* Update melee.dm

* melee's death

* update paths

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

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

* fix icon states

---------

Signed-off-by: kyunkyunkyun <120701975+kyunkyunkyun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-07-23 17:32:47 +00:00
ContrabangandGitHub f9e95a2b1d Adds an icon for non-abstract nodrop items (#29452) 2025-06-07 13:25:01 +00:00
kyunkyunkyunandGitHub f9bf03271c Two handed component slight audio improvement (#28892) 
* Update two_handed.dm

* remove unused
 2025-04-18 19:28:41 +00:00
warriorstar-orionGitHubContrabang
 		23bb467991 refactor human butchering trait (#28725) 
* refactor human butchering trait

* Update code/datums/elements/butchers_humans.dm

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

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2025-03-25 11:13:37 +00:00
CRUNCHandGitHub 39142470e8 Mop, Mop Bucket, and Janicart Refactor (#28049) 
* Update mop.dm

* This... Is a bucket

* Dear god...

* Update janicart.dm

* There's more

* No!

* Finished?

* newline

* Update janicart.dm

* Update mop.dm

* Update mop.dm

* Update mop.dm
 2025-02-18 11:13:05 +00:00
Vi3triceGitHubBurzahLuc
 		de79795367 that's a lot of actions (#28067) 
Why did the crusher have a spawn? No idea.

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-02-13 01:38:33 +00:00
MiraGitHubBurzahPopeDaveThe3th
 		dac57002ff [PORT] Add mantis blades (new traitor item) (#27594) 
* add mantis blades

* fix nuclear only

* fix .dme edit

* fix linter

* new attack chain

* maybe fix linter

* add NT mantis blade to syndicate 6

* newline

* add list

* fix nested types

* ability to pry open doors with two blades

* Update code/game/machinery/doors/airlock.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* requested changes

* remove transform

* replace sleep with addtimer

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/datums/uplink_items/uplink_general.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

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

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/research/designs/weapon_designs.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>

* add safetys and some cleanup

* return parry sound

* snake case and replace CALLBACK with VARSET_CALLBACK

* move attacking logic and update item and uplink description

* cleanup

* first attempt

* fix conditional statement

* update paradise.dme

* edit whitespace

* signal interceptors

* improve some logic

* oops

* use COMSIG_INTERACTING

* return one whitespace

* subtype for mantis blades

* replace .GetComponent() with signal

* fix typo

* better naming

* attempt_cancel_message and some logic

* split logic

---------

Signed-off-by: Mira <42539014+MiraHell@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
 2025-01-17 18:16:59 +00:00
warriorstar-orionandGitHub 3d2d73048e fix fusion gauntlets failing to deploy (#27946) 2025-01-12 19:20:00 +00:00
warriorstar-orionandGitHub 0eafad8475 Refactor /mob/unEquip. (#27720) 
* Refactor /mob/unEquip.

* fix things found in testing

* more fixes from testing

* fix removal of hooded suits

* fix flayers inability to deploy swarmprod

* fix changeling blade activation

* unnecessary parens

* pass default unequip args to proc overrides

* fix belts being able to forceMove into full hands
 2025-01-10 01:58:35 +00:00
warriorstar-orionandGitHub 525c68d617 Attack chain, initial setup. (pull *immediately* for *any* TM issues) (#26834) 
* refactor: Attack chain, initial setup.

* migrate curtain to make dreamchecker happy

* update thurible

* don't call attacked_by separately for legacy attack chain

* remove duplicate proc

* condense similar code, put allowances for legacy code in new procs

* update docs, include diagram source

* add comment on how to update diagram

* fix admonition

* mindflayer updates

* remove commented out code

* clarify all steps

* after_attack should be overridable

* whoops

* retrofit recent changes

* duh, can't restrict this yet because of tool_acts

* i hate ore bags with the fire of a thousand suns

* return correct value for object attack logic

* Various cleanups.

We don't want to attempt to pull stuff out of `/obj/item/attackby`,
because those pieces are part of the related objects' migrations, not
`/obj/item` itself. Attempting to do this causes knockon effects where
things expected to call e.g. `/obj/item/storage/attackby` in the call
chain were not ferried over to the new item interaction code, because
the related objects hadn't actually been migrated over yet.

I've used refactoring /obj/vehicle as the example for migrating
`attackby` methods instead.

* simplify some argument names

* fuck it

* make it do the thing

* Rename CI module call

* Prove that CI works

* improve test output

* aaand fix it again

* fix curtain tool interactions

* fix compile error

* fix compile error

* Better docs, introduce migration plan tool.
 2024-12-02 23:36:36 +00:00
DGamerLandGitHub 392c8fbfad Nerfs the push broom (#27469) 2024-11-27 22:06:39 +00:00
ChapGitHubContrabangAdrer
 		d90a70ecda [REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag (#26743) 
* IT WORKS UP UNTIL THIS POINT

* Consolidates SLOT_FLAG and SLOT_HUD into one

* Remove cover_both_ears

* SLOT_HUD to ITEM_SLOT

* Remove clothing_trait changes for the time being

* Remove accidental copy-paste

* Re-add no-slip var

* More failure to copy-paste correctly

* Leftover flag

* Combine left and right slot flags where possible

* UNGOOF MY DEFINES, PHAND IS NOT A THING

* Minor spacing changes

* Some more fixes from merge

* Seperates ITEM SLOT AMOUNT into two defines

* ON SECOND THOUGHT LETS NOT DO THAT.

* Addresses Contra's review

* Thank you GREP

* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES

* Added a comment to the bitmasks in clothing defines

* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY

* These are for a seperate PR.

* Magboot fixes

* Requested changes

* Re-add accidental removal

* Wrong flags

* Update code/__DEFINES/clothing_defines.dm

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

* Requested changes

* Merge fixes

* Fix double headset

* Fixes multiple accessories

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-11-13 13:02:29 +00:00
QwertytofortyandGitHub 6c2210a60d modsuit magboots save you from singulo hammer (#26858) 2024-09-20 21:16:29 +00:00
CRUNCHGitHubRyanDGamerLLucBurzah
 		9ef47e7935 Enhances the Smoking Experience - Adds Many New Item Interactions for Cigarettes and Items Interacting With Them (#25571) 
* Refactoring and other stuff.

* moar

* More smoking

* Update energy_melee_weapons.dm

* Update code/game/objects/items/robot/cyborg_gripper.dm

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

* 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 cigs.dm

* Update cigs.dm

* Update cigs.dm

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

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

* Apply suggestions from code review

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

* eee

* Apply suggestions from code review

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

* sigh

* Update cigs.dm

* Apply suggestions from code review

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

* hell

* Update cigs.dm

* aa

* cool

* 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

* aa

* aaa

* suffering

* Soon

* Is it done!? Am I finally free!?

* Apply suggestions from code review

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

* Update

* Update

* No longer assume the cig is in a mouth

* Update tools.dm

* Update pronouns.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

* 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

* update

* Attack animations for sword lighting!

* Update

* indentation

* Update cigs.dm

* minor refactor

* Update items.dm

* Update items.dm

* Update welder.dm

* Update energy_melee_weapons.dm

* Apply suggestions from code review

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

* refactor

* Update items.dm

* Apply suggestions from code review

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

* 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

* Update flamethrower.dm

* clipping

* Update legion_loot.dm

* anti attack check

* Fixes a zippo runtime

* Fixes evil runtime and stops unnecessary violence.

* Apply suggestions from code review

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

* Update based on review

* Update cigs.dm

* Update energy_melee_weapons.dm

* Apply suggestions from code review

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

* Update toys.dm

* Update energy_melee_weapons.dm

* Update legion_loot.dm

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

Co-authored-by: DGamerL <108773801+DGamerL@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: Ryan <80364400+Sirryan2002@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>
 2024-09-03 13:02:13 +00:00
RyanGitHubBurzahContrabangLuc
 		0104291682 Slaying Goliath: a Washing Machine and Dyeing overhaul (#26265) 
* Washing Machine Updates

* Dye Registry Improvement + Bug Fixes

* a couple bug fixes + beanie dyeing

* oopsie

* removes washing blacklist, it is unused

* Apply suggestions from Lewcc's code review

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

* Apply suggestions from code review

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

* why is all my code fucking

* Update code/modules/clothing/gloves/colored_gloves.dm

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

* cleanup

* Update code/modules/clothing/gloves/colored_gloves.dm

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

* machine wash updates for simple animals

* Update code/modules/clothing/clothing.dm

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

* Apply suggestions from code review

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

* adds dyeing.dm documentation

* optimizations & visible_messages

* adds SIGNAL_HANDLER

* Update code/game/machinery/washing_machine.dm

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

* update comment

* cleans up cleaning_act()

---------

Signed-off-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@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-08-19 09:38:47 +00:00
KenionatusandGitHub 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
DGamerLGitHubAdrer
 		4787bf65e0 Refactors janitorialcart/attackby and removes a very duplicated proc on mops, lightreplacers and more (#26255) 
* Wohooo refactor

* Whoops

* Adds unequip

* Fixes

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

Co-authored-by: Adrer <erwin@lombok.demon.nl>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Adrer <erwin@lombok.demon.nl>
 2024-08-02 18:08:06 +00:00
Spaghetti-bitGitHubDGamerLLucCharlie
 		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
DGamerLandGitHub 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
DGamerLandGitHub 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
QwertytofortyandGitHub 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
AffectedArc07GitHubContrabangDGamerL
 		03cca11f95 Init Sanity Unit Test (#25442) 
* Init Sanity Unit Test

* Oops

* Update code/modules/unit_tests/init_sanity.dm

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

* Makes noticeboard less silly

---------

Signed-off-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-05-23 19:43:33 +00:00
GDNandGitHub 9e6dcf9c46 removes the remaining datum redeclares (#25220) 
* removes the remaining datum redeclares

* the two fixes

* finneee contra

* OK CONTRA

* readd

* CURSED TO BE BROWN!

* facking automerge
 2024-04-21 18:26:35 +00:00
chuga-gitGitHubHenri215cybercapitalism
 		df8fef119d Ports TG bamboo and Punji Sticks (#24497) 
* adds most things

* STOP BECOMING CRLF

* half the sprites ported

* adds floor turfs, hopefully

* adds bamboo stack recipes and parameter documentation for datum/stack_recipe

* adds the crude syringe and sprite

* Revert "adds the crude syringe and sprite"

This reverts commit d949332055.

* adds crude syringe and sprite

* nevermind, goon license moment

* bamboo walls, false walls, and sprites

* caltrops check for shoe thickmaterial flag

* added spear and fixed filepaths

* smoothing and caltrops are even more broken

* Fixes sprite smoothing and caltrop weirdness

* whitespace

* fixes tile stacking

* Henri review

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

* royal blue and red carpets no longer smooth

* henri review

* actual henri review, thanks git

* Henri review electric boogaloo

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

* removes bamboo walls (rip)

* Update code/game/turfs/simulated/floor/fancy_floor.dm

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

---------

Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-04-07 09:38:10 +00:00
chuga-gitGitHubcybercapitalism
 		19c0b70171 Slightly refactors storage item insertion (#24429) 
* everything is on fire

* silent trait check

* how did it even become CRLF

* minor formatting

* fix icon updating and adds silent insertion to global trait list

* adds the new parameter to documentation - whoops!

* pain

* contra review

* contra review again, reduces amount of checks for user in the loops

---------

Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
 2024-03-24 18:41:07 +00:00
LucandGitHub 1fe7819c1b Ports action button refactor from /tg/ (#24482) 
* add the new stuff

* guh

* add the brunt of it

* action button stuff

* adds a lot of other stuff

* careful find and replace

* it loads

* so many huds

* ehh yeah this kinda works

* fixes this runtime

* hacks in some DMI stuff, we'll fix it later

* Adds better mouse pointer for dragging buttons

* gets dragging into place working again, updates DMI

* moves define

* remove extra hud defines, now it compiles

* CHECK GREP

* owww

* rename action defines

* ticks

* are we good

* let's try that again

* renames mob vars

* renames

* fixes some hud issues with huds getting the wrong variable

* fixes some alignment issues

* Adds mouse-wheel scroll support

* left -> right

* I am the entire circus

* first self-review pass

* Another review pass -- just realized I need to fix keybinds

* more testing

* update icons

* oops

* Fix spell icons not appearing properly

* fixes some outstanding issues
- Action button backgrounds now work properly
- Fixes some runtimes on dropping
- Fixes some misplaced icons

* hmm

* weh

* again?

* nah?

* maybe this?

* asdf

* should finally fix CI

* add client check

* move the ?

* add missing override causing runtimes

* shift-clicking now doesn't trigger the button

* better docs
 2024-03-24 17:38:53 +00:00
Henri215andGitHub ec90b441ad Moves weapons sprites out of items.dmi (#24634) 
* Moves weapons sprites out of items.dmi

* lets revert this

* oversight from energy melee PR
 2024-03-19 17:08:35 +00:00
QwertytofortyGitHubHenri215LucDGamerL
 		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
warriorstar-orionGitHubLucS34N
 		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
HMBGERDOandGitHub ecc109915a Stamina damage no longer bypass some checks (#23447) 
* adjusting stamina damage no longer bypass some checks

* no illness changes

* i surrender on this, let it be
 2024-02-04 21:15:20 +00:00
QwertytofortyandGitHub 09712e1541 makes 2 wizard weapons less of a pain to use. (#23356) 2023-11-29 12:15:40 -05:00
HMBGERDOandGitHub 28e54f96b2 make dualsaber great again (#23361) 2023-11-29 12:14:05 -05:00
Henri215andGitHub 6a109ade7f Moves a few sprites out of items.dmi (#23301) 
* fuck you items.dmi

* banhammer
 2023-11-24 15:39:20 +00:00
HMBGERDOandGitHub 53f6b905e6 customised_abstract_text - removed useless check, changed var (#23282) 
* customiZed, removed check that is not needed

* one more typo

* fuck it this is right in brenglish

* not need /human here

* even better
 2023-11-24 15:36:24 +00:00
HMBGERDOGitHubContrabangLuc
 		aa33cb211a Abstract items can be shown (#22183) 
* abstract weapons can be shown

* customised messages, no force visible flag

* forgot this

* Update code/modules/mob/living/carbon/examine.dm

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

* return nothing if we want to return nothing

* vortex arm abstract text

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* \n moved to examine code

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-10-20 19:58:51 +01:00
Farie82andGitHub 074959da06 Respect the inventory (#22941) 2023-10-17 15:02:15 -05:00
ContrabangandGitHub f3f9bd442a Changes slot number defines from lowercase to all uppercase (#22297) 
* undo all of it

* flags

* back

* head/mask

* left

* right

* Cuffs

* other name changes

* ID and PDA

* idk about calling them SLOT_HUD now

* glasses, gloves, and shoes, oh my!

* the rest

* comment
 2023-10-03 18:27:51 +01:00
DGamerLGitHubHenri215
 		4c976a6e01 Splits up item_inhands.dmi (#22584) 
* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

* Fixes jackhammer and glass shard

* Fixes toy Chainsaw

* Update code/game/objects/items/toys.dm

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

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

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

* Update code/modules/antagonists/vampire/vampire_powers/hemomancer_powers.dm

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

* Fixes edagger hopefully

* Henri review

* Oops

* First this gone, and now the pain

* Should all be fixed now

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-10-01 11:47:25 +01:00
DGamerLandGitHub a2922ad5fd [s] Fixes a fusion gauntlet issue (#22341) 
* Infinite sparks go brrr

* Qwerty + Steelslsayer
 2023-09-10 18:56:45 -05:00