cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-01 13:12:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
59,851 Commits 26 Branches 2 Tags
da4e51930fa4fd2befe1db6bf3c91dbf261b4a63
Commit Graph

10986 Commits

Author SHA1 Message Date
AffectedArc07
03bc64ad13 R&D Rework PT1 - The network refactor (#26420) 
* R&D Rework PT1

* Give robotics access too

* Run prettier

* More lints

* This is INCREDIBLY ironic

* Re-add blacklisting

* Oops

* Review changes

* Some fixes

* Fix outstanding issues

* Warriorstar fixes

* Tiny tweak
 2024-09-08 16:38:17 +00:00
CRUNCH
e87982e794 Update cigs.dm (#26694) 2024-09-06 09:27:59 +00:00
DGamerL
e3c73110db Adds Chemical flamethrowers (#25091) 
* Initial work

* Good enough to open a PR out of draft

* Make these use the vars on the flamethrower

* Moar fixes

* Undefines define

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

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

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

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

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

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

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

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

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

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

* This won't compile

* GDN review

* Fixes CI

* Fixes CI even more

* 5 ammo per tile now

* Heavily nerfs adding multiple fires

* Adds phlogiston as a burnable reagent

* Fixes the fire name

* Placeholder sprite + ammo use fix

* Now in cargo partially

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Lewc Review

* Adds nuclear variant

* Adds the chem flamethrower to the nukie uplink, alongside ammo

* More fire armor tweaks

* GDN review

* Update code/modules/reagents/chemistry/reagents/pyrotechnic.dm

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

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

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

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* TEMPORARY PUSH

* Adds inhands

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

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

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

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

* Fixes inhands

* Makes air hot again

* Lewc review

* Audible messages and canister refilling

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

Co-authored-by: Burzah <116982774+Burzah@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: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@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: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-05 23:12:56 +00:00
chuga-git
8482c55135 Cleans up /obj/effect/decal/cleanable (#26631) 
* makes cleanable decals not runtime when merging on windows in zero gravity. makes cleanable decals not qdel in initialize.

* Update code/game/objects/effects/decals/Cleanable/humans.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-09-03 13:16:32 +00:00
Luc
00a0b8f004 Fix runtimes when events cannot find a valid event area (#26594) 
* Fix runtimes when events cannot find a valid event area

* oops
 2024-09-03 13:13:49 +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
Daniel Lenrd
de1250ab42 Adds and Adjusts Loadout Items (#26441) 
* Give Paramedic a medical beret

* Change path of Wardens' beret

* Give HOS and Warden loadout berets

* removes Barber from Service Armbands

* Gives Captain Procedure Armband

They are technically a Head of Procedure

* Gives Explorer Cargo Armband

* Gives Geneticist Research and Medical berets

* Gives Geneticist Research and Medical armbands

* Gives Virologist Medical armband

* Gives Detective Security beret

* Gives Shaft Miner Cargo beret

* Gives Explorer Cargo beret

* Gives Geneticist Research and Medical winter coats

* Gives CMO EMT armband

they can have EMT labcoat, they are trained professional, why not?

* Gives Geneticist Research and Medical bomber jackets
 2024-09-03 13:02:33 +00:00
CRUNCH
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
1080pCat
d39cd4bb36 Reflectors now need to be anchored to reflect, as well as lowered the hp of them (#26558) 
* Reflectors now need to be anchored to reflect

* qwerty suggestion
 2024-08-29 00:05:39 +00:00
DGamerL
ccf70d51ca Makes the vortex anomaly more dangerous (#26508) 
* Makes the vortex anomaly more dangerous

* Update code/game/objects/effects/anomalies.dm

Co-authored-by: Luc <89928798+lewcc@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: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-29 00:01:56 +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
db89399e65 Fix item stacks qdeling themselves in Init and some item stack self-merge scenarios (port) (#26605) 
* stops stacks from qdeling during initialization

* fixes comments after giving up on regex replacing var name
 2024-08-28 23:58:49 +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
chuga-git
4f3827e6a1 makes blood decals clean up weightless_image on destroy (#26611) 2024-08-28 23:55:18 +00:00
Blossom
f6d01da043 Added attack_self to the petrock so you can appreciate it (#26534) 
* Added attack_self to the petrock so you can appreciate it

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Signed-off-by: Blossom <127415623+StudentBlossom@users.noreply.github.com>

---------

Signed-off-by: Blossom <127415623+StudentBlossom@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
 2024-08-27 20:37:10 +00:00
warriorstar-orion
12cf1ed3ad More varied and balanced maintenance loot. (#26500) 
* More varied and balanced maintenance loot.

* linting

* assign updatepaths script PR number

* went a bit overboard with the trash

* get rid of varedited lootdrop spawners on maps

* Separate trash and food trash for mappers

* fix incorrect food/other trash statistics

* TM feedback tweaking round 1

Significantly lower occurrence of all tier 2 items.

* allow randomizing angles, use for litter

* move trait delta to define, bump loot chance 10%
 2024-08-26 21:35:14 +00:00
Adrer
71c1ba511e Makes two modules inherent laws (#26576) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-08-25 21:15:10 +00:00
Luc
d9e573f883 Adds size-based slowdowns to flipping tables. (#26452) 
* Makes only humans able to flip tables

* tiny delay for humans too

* better wording

* No delay for humans

* 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: Luc <89928798+lewcc@users.noreply.github.com>

* Update code/game/objects/structures/tables_racks.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: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-25 18:52:20 +00:00
chuga-git
5fb580d0d2 Fixes #26559: "Dyed gloves do not appear on in-world sprite" (#26577) 
* heresy begets heresy

* delete this
 2024-08-25 18:35:12 +00:00
warriorstar-orion
4919445067 feat: Add genetics cube lockers. (#26547) 2024-08-25 16:41:17 +00:00
Spaghetti-bit
3fd78491e6 Moving while buckled or while in a locker that is locked / welded will no longer reset resist timer. (#26523) 
* Moving while buckled to a surface will no longer reset the timer / cause you to fail.

* Properly applies the same principal to closets and secure lockers.

* Changes break out time to use the MINUTES define.

* Apply suggestions from code review

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-24 16:43:47 +00:00
PollardTheDragon
f84bff3bdd Internally renames the small size to be more inclusive (#26569) 
* Renames Midgit to Dwarf

* Even more neutral name
 2024-08-23 15:06:11 +00:00
BiancaWilkson
7f64616894 someone forgor (#26556) 2024-08-20 01:23:28 +00:00
BiancaWilkson
d714315d23 wrong target (#26552) 2024-08-19 19:21:53 +00:00
Adri
c250682a04 Makes surgical trays able to hold surgical drapes (#26462) 2024-08-19 12:27:46 +00:00
PopeDaveThe3th
09ec84196c flag updates (#26472) 2024-08-19 12:27:00 +00:00
Ryan
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
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
Aylong
d0be6edeb3 Fix missing icon for Stack Craft (#26491) 2024-08-17 23:33:51 +00:00
AffectedArc07
3a3768bac3 Using explosives at end round now gibs you (#26465) 
* Using explosives at end round now gibs you

* More tweaks

* Tweaks
 2024-08-17 22:24:21 +00:00
Arthri
494704e323 Set Ore Redemption Machines to use Low Priority Messages (#26444) 
* Refactor createMessage out of message server

* Change radio message

* Add reminder

* Fix linting errors

* Fix more linting errors

* Update priorities

* Add low priority icon

* Lower indent

* Fix switch statement

* Add low priority icon

* No reminders for low priority messages

* Update priorities in frontend

* Build and update /tg/ui

* Fix typo

* Clarify purpose of return

* [ci skip]

* Build and update /tg/ui

* [ci skip]

* Build and update /tg/ui

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
 2024-08-17 15:31:33 +00:00
HMBGERDO
fbe49dabbc Fixing blood spreading too much during surgery (#26266) 
* bloody blood

* ehhhh

* here too

* bloodwrite fix

* a

* review changes

* max blood amount to argument

* Update code/game/atoms.dm

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

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

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

* tab

---------

Signed-off-by: HMBGERDO <61080616+HMBGERDO@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-15 23:51:48 +00:00
PopeDaveThe3th
52db63784e Adds 3 new light crates (#26449) 
* adds 3 illumination crates

* adds more glowsticks to premium box

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

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

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

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

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

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

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

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

---------

Signed-off-by: PopeDaveThe3th <80988376+PopeDaveThe3th@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-08-14 14:40:52 +00:00
Aylong
d9927eb62a Fix ore picking with bag (#26488) 
* No comments...

* Update code/game/objects/items/stacks/stack.dm

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com>

---------

Signed-off-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-13 15:10:16 +00:00
Burzah
c434f08f4f Replaces info class with notice and purges info (#26421) 2024-08-13 09:46:58 +00:00
Charlie Nolan
73332ea101 Add an admin-spawn-only syndicate scanner (#26434) 
* Add admin-spawn-only syndicate scanner.

* Add cooldown and sound on hit.

* Vars cooldown time.

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

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

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

* Code quality.

* Apply suggestions from code review

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-13 09:46:35 +00:00
Aylong
e1ce7b9572 Fix stack merge & return lost code (#26483) 
* Fix stack merge & return lost code

* What is `S` and `O`?

* Comment

* Update code/game/objects/items/stacks/stack_recipe.dm

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

---------

Signed-off-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-13 01:24:49 +00:00
DGamerL
e61b21d7d1 Fixes ores runtiming when being picked up (#26479) 2024-08-12 19:14:46 +00:00
Aylong
11d98a0e44 [TGUI] Stack Craft 3: Rebirth (#26443) 
* Initial commit

* Back to JS (Skill Issue & lazyness)

* Update UI please

* No need that

* Uhhh... documentation?
 2024-08-12 17:32:30 +00:00
CRUNCH
3fd9106d5a Tidies up grenades. (#26083) 
* Clean up grenades

* Update clusterbuster.dm

* Update grenade.dm

* Update flashbang.dm

* Update grenade.dm

* Update frag.dm

* Update code/game/objects/items/weapons/grenades/frag.dm

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

* Update code/game/objects/items/weapons/grenades/ghettobomb.dm

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

* update

* Update code/game/objects/items/weapons/grenades/frag.dm

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

* update

* update

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

* Update code/game/objects/items/weapons/grenades/frag.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: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>

* extra var

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@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-09 01:06:23 +00:00
PollardTheDragon
2d94ff16f4 Getting Medieval - Breach Cleaver (#26298) 
* Securiblade, Sheaths

* Snakesfang and Cleaver

* Crates and Armory

* Origin Tech Fix

* Chargers can now accept securiblades

* Clan Cleaver is now Breach Cleaver

* Armor Checking

* Comment and description fixes

* State comment

* More Comments

* Contains list fix

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

* Breacher sword hates doors

* Tab indentation

* Breacher Armor Buff - Status Effect while wielding

* Breach Cleaver Sounds - courtesy of Stoniest

* Snakesfang Codersprites

* Define Fix

* Breach Cleaver - Icon Codersprites

* Breach Cleaver Codersprites

* Gave help-intent attack on cleaver an animation

* Reduced sound intensity of wielded harm

* Moved variables below inherits

* Buff spacing, guard clause

* Improved examine

* Guard clauses the secsword powercell

* Sword mode defines

* Added undefs

* Spacing

* Securiblade loreful examine_more

* Examine_More for all swords

* Grammar

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

* Moved defines, added auto-docs, grammar

* Fixed secsword recharging

* Secsword burn function fix

* Cleaver Armor Buff Fix

* Fix to buff

* Securiblade burn fix, stamina charge reduction fix

* Breach Cleaver - Wielding sprite consistency, fixed sheath orientation when unsheathed

* Fixes securiblade EMP oversight

* Snakesfang can parry now

* Spelling

* Removed define indents

* Early returns

* A whole lot of fixes. Qdels the cell on delete.

* stun_delay proc doc

* Update code/datums/uplink_items/uplink_general.dm

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

* Merged IF statements, relocated inits

* Armor change

* Remove null in cell variable

* Ifs to Switch

* Revert "Armor change"

This reverts commit 6b61e33433.

* Better Ifs to Switch

* Removes roundstart armory blade, increases crate cost to 550

* Removed extraneous loc check, removed extraneous link cell proc

* Added null check to secsword/emp_act

* Added clear_cell proc to replace duplicate icon updates and cell nulls

* No vars in proc argument

* Properly nulls cell. Fixes cell sabotage for sword

* JustTheCleaver

* Forgot about the recharger

* Logic Change - Combined two Ifs

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

* Removed  extraneous permit var

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

* Early returns on object attacks

* Fixed missing cleaver sheath

* Fixed comment format

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

* Removed extraneous line

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

* cleaving_armor_boost variable standardization

* Added intent and effects to attack logs

* Added notice to description span for antags

* Made the armor buff into a var

* Replaced get_dir(src, get_step away(H, src) with user.src

* Fixed stat check

* AP Changes

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@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-08-09 01:03:47 +00:00
DGamerL
3a0d6860a6 Makes dry mops insert properly into the janicart (#26427) 
* Makes dry mops insert properly into the janicart

* Oops
 2024-08-08 00:40:54 +00:00
Aylong
77a1a3494f Fix invisible rolling paper pack (#26419) 2024-08-07 13:27:34 +00:00
CRUNCH
2c1fcbd7da Merges the Hug Module With the Cyborg Gripper (#26007) 
* Hugs

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

* Update cyborg_gripper.dm

* AGHHH!

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

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

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

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

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

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: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-07 13:07:36 +00:00
Migratingcocofruit
a0308e048a Fixes medical grippers not being usable in surgery (#26311) 
* Fixes medical grippers not being usable in surgery

* Adds a new trait for tools that behave like an open hand  in surgery. uses that instead of a typecheck.
 2024-08-07 00:02:03 +00:00
DGamerL
7b151850d4 Makes surpluses spawn items again (#26411) 2024-08-06 20:40:40 +00:00
CRUNCH
bccf624639 Adjusts IPC Adrenals to be Like Regular Adrenals - Robotic Equality Update! (#25903) 
* Robot equality!

* Update medicine.dm

* e

* Update drugs.dm

* normalise drugs

* normalises medicine

* Update medicine.dm

* Update medicine.dm

* Update medicine.dm

* Update code/modules/reagents/chemistry/reagents/medicine.dm

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

* update based on suggestions

* Update medicine.dm

* Update medicine.dm

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

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

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-08-05 18:27:37 +00:00
1080pCat
2d48d02ad7 Fixes the B-RPED trying to upgrade machinery that dont have stock parts (#26400) 2024-08-05 18:26:46 +00:00
Faron
4831c0624f Adds an abandoned security shuttle space ruin (#25922) 
* Update cell.dm

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

* Update medbeam.dm

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

* Update crates.dm

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

* Update mob_spawn.dm

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

* Update undead.dm

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

* Update space_ruins.dm

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

* Update space_areas.dm

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

* Add files via upload

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

* Add files via upload

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

* Update medbeam.dm

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

* Update space_ruins.dm

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

* Update undead.dm

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

* Update mob_spawn.dm

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

* Update abandoned_sec_shuttle.dmm

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

* Update space_ruins.dm

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

* Update cell.dm

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

* Update code/modules/projectiles/guns/medbeam.dm

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

* Update code/game/objects/structures/crates_lockers/crates.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/simple_animal/hostile/retaliate/undead.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/simple_animal/hostile/retaliate/undead.dm

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

* Update crates.dm

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

* Update medbeam.dm

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

* Update medbeam.dm

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

* Update abandoned_sec_shuttle.dmm

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

* Update config.toml

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

* Update effects.dm

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

* Update particles.dm

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

* Add files via upload

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

* Update medbeam.dm

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

* Update effects.dm

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

* Update space_ruins.dm

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

* Update space_ruins.dm

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

* Update code/modules/projectiles/guns/medbeam.dm

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

* Update code/modules/projectiles/guns/medbeam.dm

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

* Update code/modules/projectiles/guns/medbeam.dm

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

* Update space_areas.dm

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

* Add files via upload

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

* Add files via upload

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

* Add files via upload

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

---------

Signed-off-by: Faron  <171642577+FaronCD@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-04 10:09:08 +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