cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-20 22:42:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,061 Commits 28 Branches 2 Tags
59ce9b5ead2f3bf4f013dfb3e75fd17157fe3aa5
Commit Graph

7121 Commits

Author SHA1 Message Date
Chap
59ce9b5ead [FIX] Prevent duplicate cyborg upgrades (#26731) 
* Disallows installing duplicate cyborg upgrades.

* Prevent duplicate Cyborg modules

* Unecessary spacing removed

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

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

* usr > user

* Move nodrop check into do_install

* ... Why did I do that?

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-10-09 10:47:19 +00:00
DGamerL
a01f41e904 [s] Blocks any doubled wall mount placement (#27016) 
* Blocks any doubled wall mount placement

* Fixes direction stuff

* Remove old code
 2024-10-07 20:08:11 +00:00
Contrabang
413ddc8b73 Adds Floor Lights (and makes lights not have random ranges) (#26923) 
* Adds Floor Lights

* undef

* remove TECHNICAL DEBT™

* remove more technical debt™

* mapping changes
 2024-10-06 09:33:31 +00:00
Сиротка
b6f51c1f49 Nerf Space Loot (#26738) 
* Decrease Gamer loot in space

* Update depot_spawners.dm

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

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

* Update depot_spawners.dm

* Update code/game/objects/effects/spawners/depot_spawners.dm

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

* Update energy_melee_weapons.dm

---------

Signed-off-by: Сиротка <114731039+ErdGinalD@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-10-06 09:28:11 +00:00
Kenionatus
95888bbfc1 Add Seppuku to the Captain Saber (#26936) 
Simple (almost 1 to 1) copy paste from eswords (because  oop sucks).
 2024-10-03 13:17:17 +00:00
Truls20
e9ea474d43 Adds 0.75 toolspeed to medical wrench to put it in line with the other departmental tools (except command multitool) (#26924) 2024-10-02 15:17:56 +00:00
Truls20
fe83fe8af4 Lets cyborgs pick up catwalk tiles (#26944) 2024-10-02 15:17:10 +00:00
Qwertytoforty
e118716f16 HAUUUUUUUUGH (#26959) 2024-10-02 00:03:27 +00:00
DGamerL
277324951e Such a hard thing to code (#26912) 2024-10-01 17:20:14 +00:00
DGamerL
603d71710d Makes the BRPD fit in belts (#26911) 
* Makes the BRPD fit in belts

* Also military belt
 2024-10-01 17:15:48 +00:00
DGamerL
a4d7950d53 [s] Makes powerfists a bit more sane (#26939) 
* Fixes powerfists

* Slightly making it better
 2024-09-29 18:26:21 +00:00
warriorstar-orion
b61f4f3ff8 feat: Storage shelves and gun racks. (#26744) 
* feat: Storage shelves and gun racks.

* Apply suggestions from code review

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

* review comments

* better examine

* fix lint

* Examine for empty shelves

* Apply suggestions from code review

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

* rest of review comments

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-28 22:28:44 +00:00
warriorstar-orion
3eb0c0dcd5 fix: move pipe icon manager out of SSair (#26867) 2024-09-27 05:22:17 +00:00
Aylong
3349e62bd8 Replace some icon2base64 with DmIcon (#26885) 
* Vending DmIcon

* FloorPainter DmIcon

* Nuh uh
 2024-09-26 10:13:31 +00:00
Kano
1896ed9fd8 Tweaks Derelict Facility ruin loot and adds a new item (#26517) 
* part 1

* no you don't

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* Update code/game/objects/items/devices/radio/beacon.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

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

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* spawner update

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* Update code/modules/mining/equipment/wormhole_jaunter.dm

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* Forgotten main reward

* many things were forgotten

---------

Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-09-26 10:04:41 +00:00
Chap
48807f8c0a [s] [FIX] Structure stacking fix (#26903) 
* You can no longer stacking structrues on top of each-other

* Stop structure stacking

* Updated comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-09-26 08:54:41 +00:00
BiancaWilkson
91e0882676 adds bonk (#26759) 2024-09-25 23:53:56 +00:00
Adrer
d856d5c74b [TWEAK/BALANCE] Destroyed monkey cube box now destroys monkey cubes inside (#26816) 
* Destroyed monkey cube box now destroys monkey cubes

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

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

---------

Signed-off-by: Adrer <erwin@lombok.demon.nl>
Co-authored-by: Adrer <adrermail@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-09-23 22:46:45 +00:00
Aylong
9d968e6ba9 Port DmIcon & Image components from TG (#26623) 
* Port DmIcon & Image components from TG

* Documentation

* Uh oh

* I hate it

* I will bang you
 2024-09-23 21:04:37 +00:00
Adrer
51c64edfc5 You can no longer put the cyborg gripper in a display case (#26848) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-09-22 23:01:23 +00:00
Qwertytoforty
6c2210a60d modsuit magboots save you from singulo hammer (#26858) 2024-09-20 21:16:29 +00:00
warriorstar-orion
cca2b52e8d [s] Fixes a thing. (#26836) 2024-09-19 13:13:13 +00:00
1080pCat
fc1d20217c Fixes gas grenades not going away after detonation (#26770) 2024-09-19 02:26:07 +00:00
Coolrune206
fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
BiancaWilkson
8883a72060 Fixes borgs being unable to pick up some items. (#26791) 
* Fixes cyborg stack merging

* i dint push

* Wait, this is fine actually
 2024-09-17 17:23:17 +00:00
Qwertytoforty
8925b33df4 oopsie (#26810) 2024-09-17 16:19:08 +00:00
Сиротка
bac06b2f0e Nerf Clown minibomb (#26806) 2024-09-17 09:19:03 +00:00
CRUNCH
8274dcccac Return the parent function thanks (#26679) 2024-09-16 14:42:19 +00:00
Adrer
8d82546d9d [FIX] Mobs that were offered up to ghosts no longer get taken over by their old owners (#26650) 
* Grab_ghost now checks the ckey of the mind

* Remove superfluous loops for getting ghosts.

* Early return for MMI

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-09-16 14:39:54 +00:00
Qwertytoforty
a0c7867581 you no longer can instantly husk people as an ERT inquisitor (#26798) 2024-09-16 04:01:01 +00:00
Silverplate
024af9c248 Removes tech levels from high risk items (#26725) 2024-09-16 03:28:49 +00:00
BiancaWilkson
f42a7d9ab0 Fixes a runtime caused by stacks accidentally merging twice (#26795) 
* Fixes empty stacks trying to merge together

* more accurate comment
 2024-09-16 01:58:29 +00:00
Qwertytoforty
44694d8fa5 makes you unable to to see inventory from another zlvl (#26793) 2024-09-15 20:19:48 +00:00
DGamerL
515d3ebd95 Makes chemical flamethrowers more efficient (#26742) 2024-09-14 02:59:12 +00:00
Christasmurf
1f9945ee5f Captain's sabre - Resprite and rebrand (#26592) 
* rapier-rebrand

* extdesc change

* indentation

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

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

---------

Signed-off-by: Christasmurf <25437893+Christasmurf@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-09-12 17:24:14 +00:00
PopeDaveThe3th
fe834bffee Updates some salvage lore (#26595) 
* salvg

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

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

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

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

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

Co-authored-by: Taurtura <141481662+Taurtura@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Taurtura <141481662+Taurtura@users.noreply.github.com>
 2024-09-12 17:05:26 +00:00
DGamerL
62601ab838 Various chemthrower fixes (#26697) 
* Various chemthrower fixes

* Slight tweak

* Fixes extended thrower

* Fixes

* Slight examine tweak

* Name tweak and a fix
 2024-09-12 17:00:32 +00:00
warriorstar-orion
716428dfbf fix: remove two unused vardecls (#26756) 2024-09-11 18:01:52 +00:00
chuga-git
f57ebfa1a0 Fixes stacks, attempt 2 (#26633) 
* this is hell pain

* fixes merge issues when cutting up various items

* adds early return to attackby
 2024-09-10 22:14:01 +00:00
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
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
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
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