cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-11 10:02:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
62,469 Commits 26 Branches 2 Tags
37bcc87b39cd98ac49cba7f351663a4fa2274b8a
Commit Graph

120 Commits

Author SHA1 Message Date
Contrabang
1504ed98be massive burndown (#29894) 2025-07-27 20:52:39 +00:00
YoureNotTheSharpest
50ebfe143a removes sterilizine and replace all mentions with spaceacilin (#29124) 2025-05-30 20:49:00 +00:00
warriorstar-orion
f9ade844c9 Kitchen rework part 1: machines and recipes. (#28277) 
* Kitchen rework part 1: machines and recipes.

* update oldstation

* update updatepaths script number

* fix blank icon test

* remove old deep fryer completely

* fix duped recipes and recipe datum names

* add chef PDA cart to chefdrobe

* nerf grill wood consumption rate

* multiply food for cooking machine rating

* fix runtime

* add cookware to syndie base and oldstation

* remove dupe burger recipe, update syndie/oldstation setups

* nerf potency quality award

* buff burn/ignite times, remove pointless on_fire flag

* more grill woodburn nerf

* meh

* try and unfuck timing issues

* more fixes and icon updates

* more fixes

* more review changes

* fix linter

* disable pcwj debug

* fix grill and deep fryer overlays

* fix timers with no containers

* attempt to fix reagent adding issues

* more cleanups

* allow rped usage

* grammar, null checks, reagent display

* PDA updates, map updates

* fix mats values

* new panel sprites

* recipe fixes, add prep bowl

* revert unused icon file changes

* move this to mesh with smith TM

* remove food quality for now

* New sprites, autochef.

* fix examine text

* reduce oven cook times

* lots of fixes

* fix autochef recipes that start with reagents

* prevent shenanigans

* megapatch 1

* block ingredients behind oven door

* PDA app improvements

* remove unused proc

* fixes for cookbook, descontructions, completed steps

* allow empty containers with a tracker to be claimed

* allow reclaiming

* autochef reliability fixes

* autochef reliability fixes

* fix quality product count

* update updatepaths script

* better stack handling

* more fixes for stacks and reagents

* timers no longer turn off burners automatically

* autochef turn offs and make sure we can see output storage

* add microwave recipe for roundremoving player brains

* Apply suggestions from code review

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

* burza review 1

* Apply suggestions from code review

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

* fix berry muffin name while i'm here

* grill -> microwave in new tests

* grill -> microwave in new tests, but actually for realsies

* i definitely know what i'm doing

* redundant attack chain setting

* add examine text about clearing buffer

* remove unused vars and start improving docs

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2025-03-23 04:59:08 +00:00
ExusA
a1ff715bf1 Adds a bunch of buildable wood stuff, resprites planks (#28528) 
* New wooden furniture

* Bonfire repath

* Wood retexture

* Wood Resprite

* Fixes

* Description fix

* Fixes

* Undo match changes

* Undo match icon changes

* Typepath script

* rackable spears

* bounding box adjustment

* Spear Rack

* Memorial tweaks

* Apply suggestions from code review

Co-authored-by: Toastical <vnndvp@gmail.com>
Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>

* More memorial tweaks

---------

Signed-off-by: ExusA <67055922+ExusA@users.noreply.github.com>
Co-authored-by: Toastical <toastical@toaster.com>
Co-authored-by: Toastical <vnndvp@gmail.com>
 2025-03-16 18:02:40 +00:00
Tojo
0d968d7803 Reworks Curtains (#28163) 
* Reworks Curtains

* Update code/game/objects/structures/curtains.dm

Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* New Overlay Code

* THE BEGINNING OF HELL

* Interact with Atom on mountable

* Fixes return, looks mergable.

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update code/game/objects/structures/curtains.dm

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>

* Update Overlays Refactor

---------

Signed-off-by: Tojo <32783144+Alecksohs@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2025-02-26 09:58:51 +00:00
Bm0n
6a63097109 Converts a bunch of items into using neck slot (#27474) 
* woe upon me

* update

* few changes

* critters

* critters

* THIS IS A CERTIFIED VOX CLASSIC

* removes comment from sql script

* i think i have a skill issue

* fuck

* TGUI Bundle Rebuild

* furcape

* attackby update

* cerefix

* buildstgui

* ajust size of loadout menu again

* tie layering toggle

* renames layer

* fucking map conflicts

* woe

* deconflict

* tgui

* conflicts again

* conflicts

* manual deconflict again

* oops

* TGUI Bundle Rebuild

* TGUI Bundle Rebuild

* give this one more try

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* Update code/modules/clothing/neck/necklace.dm

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

* review

* scarffixforemerald

* tgui rebuild

---------

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>
 2025-01-02 22:47:50 +00:00
warriorstar-orion
0ffa8303a7 Rename all non-snake_case types. (#27268) 
* refactor: Rename all non-snake_case types (not procs or vars (yet)).

* completely dynamic update script

* might help to include the data

* update aa's scuffed python

* oh

* set script PR number

* run updatepaths again

* Add other table updates with JSON columns

* bump SQL version

* just fucking end my life

* move JSON data
 2024-11-30 19:08:45 +00:00
DGamerL
2032afb65d Fixes extended thrower recipes (#26698) 2024-09-06 01:31:17 +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
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
matttheficus
20321dbefd Skateboard Nerfs - The Bigger One (#26192) 
* everything but backpack wear

* fixed - TODO: backsprites

* undo price change
 2024-07-15 21:59:50 +00:00
Taurtura
1e1b711be5 More medkits ! With the correct branch this time! (#25985) 
* tactical medkit craft

* machine and aquatic kit from plastic

* adds fake tactical kit

* change recipe to make the fake tactical kit
 2024-06-29 17:59:35 +00:00
Qwertytoforty
f6b8d87e78 Adds sscooters and skateboards [serious pr do not close after AFD] (#24934) 
* WORLD WIDE NOISE

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

* grind on pipes

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

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

* temporary change for icon conflicts (hopefully)

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* The rest of the fun loving owl

* missed this one

* Apply suggestions from code review

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

* changes

* Apply suggestions from code review

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

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

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

* I love stealth conflicts!

* purge lines

* Apply suggestions from code review

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

* Update tg_vehicles.dm

* works works works

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

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-06-25 21:38:40 +00:00
HMBGERDO
c38eddeaae make the spear purple again (#25677) 2024-05-30 15:12:32 +00:00
Сиротка
4add53d6c1 Add alternative Spear recipe for Ash walkers (#25208) 
* Add alternative Spear recipe for Ash walkers

* Update recipes.dm

* Update code/modules/crafting/recipes.dm

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

* Update code/modules/crafting/recipes.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-04-29 02:00:34 +00:00
Qwertytoforty
a50683ef28 Adds the SPRK-12 Energy Pistol (#24869) 
* Adds the SPRK-12 Pistol

* I Was improper and forgot to name it right

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

* Apply suggestions from code review

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

* check it

* Update gun.dm

* less copypasta

* Apply suggestions from code review

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

* early return

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
 2024-04-28 22:03:14 +00:00
warriorstar-orion
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
HMBGERDO
b4c52d70da i ded pls nerf: Combat Beakers (#23708) 
* reagent splash now different from touch

* arghhghghg

* hghg

* FUCK THE BOTANY OORAH

* only botany smoke affected

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* removing REAGENT_SPLASH, cleaning up

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

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

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>

---------

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2024-01-21 21:12:33 +00:00
DGamerL
db578cdc6f Makes food not a subtype of reagent holders (#23379) 
* I am suffering

* Alright this should be all now

* Fixes CI

* I hate the online merge resolver.

* This got lost in the merge master

* Updatepaths fixed + new added

* Contra review

* Fixes desserts

* Oops

* This should fix it

* Maybe?

* Attempt 3

* Missed conflict

* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* Fixes grinders

* Adds comment

* Warrior review

* Warrior + Sirryan review

* Update code/modules/food_and_drinks/food_base.dm

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

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2024-01-21 19:00:02 +00:00
Qwertytoforty
e8b13b38cb Purges improvised and overloaded improvised shotgun ammo (#23739) 
* Purges improvised and overloaded improvised shotgun ammo

* order order tape recorder
 2024-01-14 12:34:26 +00:00
BiancaWilkson
cbc45c1336 Pneumatic Cannon Refactor (#22956) 
* camelcase and snakecase on the same line...

* the rest, i dunno

* PERIODDDDTTTTTT

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

* the

* new variable name

* don't need that

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

* lewc's suggestions + new fun var to play with

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

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

* bjam's suggestion

* adjusting settings is now a seperate proc

* swap some stuff around

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-12-11 16:53:11 +00:00
DGamerL
0e18a8e11d Qwerty_Whoops (#23170) 2023-11-12 19:46:03 +00:00
JimKil3
e1c77e9031 Makes gauze/ointment craftable; refactors a bit of crafting code (#23127) 
* the features

* smartfridge

* whoops

* Update code/modules/crafting/recipes.dm

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2023-11-11 20:28:45 -05:00
Qwertytoforty
357c62b6d7 Ports hitscan from TG, adds it to *SELECT* things (#22754) 
* this was just going to be a plasma cutter change but no had to make it look good, whats next, ai sat turrets (yes)

* ai turret

* Coca cola, don't forget the ice. Or the pulse

* almost done, pull master than map edit

* we ball

* ah, chasms.

* it's for the best. Fuck should not sleep checker though

* hitscan reflection limiting system

* Apply suggestions from code review

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

* c-c-c-changes

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-11-01 20:05:27 +00:00
LiberatedWaveMan
e09be2b54e You got a fuckin' problem mate? Adds the glass shiv (attempt 2) (#22416) 
* Redoes the Shiv PR, adds shiv (ready to go)

* Update code/modules/crafting/recipes.dm

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

* Update code/modules/crafting/recipes.dm

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

* Update kitchen.dm

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
 2023-09-19 22:47:53 +01:00
Qwertytoforty
d42d2f647d Added the Combat Bakery Kit (#21901) 
* QUASO

* Apply suggestions from code review

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

* blame lewc for giving me spaces

* Update code/datums/uplink_items/uplink_traitor.dm

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

* Update code/datums/components/boomerang.dm

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

* Apply suggestions from code review

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

* Update code/game/objects/items/granters/_granters.dm

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

* purge that

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
 2023-09-13 21:32:30 +01:00
Luc
327add6348 Converts two-handedness/wielding to a component (#21619) 
* initial checkin

* Add everything but maps

* update paths

* Patches some minor bugs across twohanded things

* remove a stowaway

* Update code/__DEFINES/dcs/signals.dm

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

* Contra review

* Fix kc

* hopefully fix file perms

* Fix file perms

* revert line-endings

* uh?

* Trying once again to fix file formats

* henri review 1

* henri review 2

* update from master

* Removes override that breaks modsuits

* re-add reference

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2023-09-01 22:06:59 +01:00
DGamerL
887a5111df Adds confetti shot (#21462) 
* CONFETTI CANNON

* proc and contra review

* sprite names

* nukie uplink and lewcc suggestions

* chemical fixed

* fixes party drums cost and chem explosion sound

* Henri review

* renames a datum because I copypasted shit

* changes a name because I copy pasted

* removes an extra space

* things I forgot + bundles + recipe change

* Oopsie + tones down the volume of confetti
 2023-07-07 13:44:55 +01:00
DGamerL
d9f5e1fa49 the logging (#21310) 2023-06-12 17:21:25 -05:00
Taran
7b2bd705b2 Fixes molotov cocktails being used to craft molotov cocktails (#20989) 
* blacklists molotov cocktail for crafting itself

* prevents using a blacklisted items to craft

* for loops ands comments

* Update code/modules/crafting/craft.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* Update code/modules/crafting/craft.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* adds missing ")"

---------

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-22 21:31:27 +02:00
Qwertytoforty
d5567103fd Reworks the lwap to make it better. (#20884) 
* Boss you killed a child... AMAZING MISSION COMPL-

* small patch fix other stuff later

* More fixes to clicking on the dot

* lwap scopes better / decativates on movement

* Apply suggestions from code review

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

* requested changes

* lower speed by marms suggestion

* scope keeps creeping

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* henks changes

* define

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2023-05-02 21:28:34 +02:00
S34N
3efa23076c Fixes wonky donk list (#20707) 2023-03-26 11:45:23 +01:00
Burzah
de357e657d adds a category to empty donk box (#20694) 2023-03-22 10:04:29 -05:00
Coolrune206
48eb386e5c Donk Pocket Cooling 2: The Reworkening (#20453) 
* donk pocket rework

* Snowball had a far more sensible way to do this

* lewcc review

* Sirryan review

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

* I fix?

* Revert "I fix?"

This reverts commit 1517d2e21e.

* please work you stupid .dmi

* WORK DAMN YOU

* will this hypothetically work

* re-adds syndie donk kit

* documented these

* just return

* clause guarded

---------

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-03-20 14:26:06 -05:00
Qwertytoforty
5197d1b62a Completely reworks the tesla revolver (need to work on damage values) (#20295) 
* part one: the rest of a fucking owl

* kit

* shocking changes

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

* Update code/modules/projectiles/projectile/energy.dm

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

* Update code/modules/projectiles/projectile/energy.dm

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

* Update energy_projectiles.dm

---------

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2023-03-17 10:26:02 -05:00
Coolrune206
0aeee5abea where's my cookie matt (#20537) 2023-03-04 22:20:00 +00:00
Coolrune206
f90418d715 Re-adds the LWAP, reworked (#20401) 
* re-adds the lwap

* no dual wielding snipers

* Lewcc review

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

* Hal9000 request

---------

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2023-02-25 21:19:03 -06:00
warriorstar-orion
a7d09cf033 Whitespace cleanup part 2. (#19891) 2022-12-24 18:38:43 +01:00
Coolrune206
447edfdf83 converts laser slugs to laser scatter shot (#19552) 2022-11-01 20:51:08 +01:00
Qwertytoforty
4c13246d30 Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5 (#19170) 
* Adds the u-ION silencer to rnd, replacing ecrossbow. Ecrossbow up to syndicate 5

* grammer / typeblock

* 15 is not more than 15

* how did I miss this, I swear I put in 3

* path + crafting

* Update code/modules/crafting/guncrafting.dm

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
 2022-10-14 08:28:07 +02:00
Qwertytoforty
d530aeba33 Energy crossbow gunkits now need a laser gun (#19087) 
* Lockboxes energy crossbow gunkits

* converts to requiring a laser gun
 2022-09-18 22:02:09 +01:00
Bm0n
d43eb77b25 Replaces Free Guns From Sci With Parts Kits (#17918) 
* rip sci powergamers

* grammar

* apparently i don't know how to spell

* code review

* +to

* oook

* a over the
 2022-06-26 18:53:03 +01:00
Kugamo
7e822f71f8 Fixes Golden Bike Horn Crafting Runtime (#17948) 
* ClownCraft 2.0

* oops
 2022-06-11 20:55:19 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
E-MonaRhg
ac68ea59df Carpet and table stuff 2021-11-05 19:46:42 +02:00
E-MonaRhg
f9c672ffa2 A lesson in testing your PRs (#16969) 2021-10-18 16:15:54 +01:00
E-MonaRhg
310616cdf3 Carpet bomb your local station 2021-10-14 20:23:11 +02:00
botka4aet
ebf20f8806 Bone items review fix 2021-09-17 11:13:32 +03:00
botka4aet
d49cfd2322 2 new tribal items 2021-09-10 11:07:54 +03:00
Ryal
93a0f58f21 Honkbot tweaks (#15808) 2021-04-05 15:56:57 +01:00