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

44579 Commits

Author SHA1 Message Date
Сиротка fcbb1a590f Update gasmask.dm (#26454) 2024-08-11 08:50:46 +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
BiancaWilkson 8ee325ecd7 its always important to remain silent if you have nothing nice to say (#26431) 2024-08-08 21:16:55 +00:00
warriorstar-orion 2a3a84b438 refactor: Biohazard stats (again) (#26424) 2024-08-08 16:35:12 +00:00
chuga-git af735ed400 Fixes flash check runtime when flashee does not have eyes (#26409) 
* fixes null runtime

* the ASCII code for " " is 32, or in 0x0020 in hexadecimal

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

Co-authored-by: DGamerL <108773801+DGamerL@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: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-08 16:11:56 +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
DGamerL 50edcb46b8 Makes emitter hits that didn't turn on the SM not get logged by investigate (#26375) 
* Silly mistake

* Easier solution
 2024-08-07 13:28:19 +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
BiancaWilkson be27510c41 Fixes tether module being able to tether yourself (#26403) 
* turf check yippee!

* Update code/modules/mod/modules/modules_engineering.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
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>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-08-07 07:53:29 +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
Kyani 5c32524456 makes cloning scanner deconstructable (#26394) 
* Update clonescanner.dm

* removes unnecessary code
 2024-08-07 00:01:09 +00:00
DGamerL 341b693132 Fixes trifecta not handing out objectives properly (#26412) 2024-08-06 23:34:35 +00:00
chuga-git 5ad66a3d55 \ref -> UID (#26410) 2024-08-06 20:41:58 +00:00
DGamerL 7b151850d4 Makes surpluses spawn items again (#26411) 2024-08-06 20:40:40 +00:00
warriorstar-orion 78ef86989f Fix: Bespoke DCS elements use all requested args. (#26387) 2024-08-06 19:29:39 +00:00
Spaghetti-bit 52327cea40 [TWEAK] Runechat Color Preference and Species Dependent Organ (runechat) Removal (#26018) 
* Reopens runechat color tweak.

Fully changes how the runechat color works with human mobs.

- Ties Runechat color to DNA (unchangable via scramblers, or other methods like DNA modifying)
- Runechat color is now a preference based thing and can be changed at mirrors.

* Linter mint

* Comment for comment's sake + Rerun cerestation CI/UNIT test because mouse ate a cable.

* augh

* reverts toml

* Fixes a SQL query, good for final review.

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-06 13:15:47 +00:00
S34N cf136b9d17 516 compat: Replace caller with requester (#26401) 
* replace caller with caller_

* requester
 2024-08-05 18:39:07 +00:00
Kyani 6fd371efd9 Update organ_external.dm (#26396) 2024-08-05 18:38:12 +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
BeagleGaming1 5d9b6067a8 Update cell.dm (#26392) 
Signed-off-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
 2024-08-04 18:00:52 +00:00
warriorstar-orion 20f8fd10e3 remap: Farragus Cargo. (#26042) 
* remap: Farragus Cargo.

* fix rock edges and struts

* docking ports aren't nearspace

* separate atmos/EVA in starboard south, fix doors, add store trash

* lint fix

* i uh forget

* qm windows, maints improvements

* more maints decorating

* fix electrochromic area

* tiny bit more mining-themed

* sean review #1

* fix windoor access on cargo office

* 1080p review 1

* accidentally uncommited changes from above review

* one last grilled spawner replaced

* misclick

* fix disposals corners and y-junction

* completely forgot to update sec telepads

* as many APCs as possible pulled into maints

* fix conflicted tile

* remove disconnected disposal pipe

* fix disposals redirecting into psych office
 2024-08-04 17:27:37 +00:00
Migratingcocofruit b1192460e4 BSH update (#26032) 
* MOAAAAAR POWEEEEEEER

* base points are per level again. reduced to 2

* Style changes, spaghetti is now in a box and the alert logic has been tidied up

* Stabilizer and Autoshutoff buttons are now stuck in the off position when emagged

* Rebuild TGUI

* Rebuild TGUI

* rebuild tgui

* Emag now forces highest level possible

* Rebuild TGUI

* Portal amount no longer dependent on stabilizers. Stabilizers no longer stabilize when off. Portal spawning message now only plays if there are no portals currently spawned to prevent spam when auto shutdown is disabled. Warning message now correctly indicates auto shutdown is disabled. Improved Readability

* corrects a comment

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-04 17:10:43 +00:00
DGamerL 319a3d0bf6 Adds hijack items back to the uplink (#26390) 2024-08-04 16:53:59 +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
DGamerL 2f591a301c Makes people on skateboards unable to pull things (#26191) 
* Makes people on skateboards unable to pull things

* Removes duplicate definition

* Contra review
 2024-08-04 09:07:03 +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
warriorstar-orion 19d720450d fix: Autoapply disposal sort junction names. (#26377) 2024-08-04 08:03:04 +00:00
PollardTheDragon 88fbe41208 Allows Job and Species specific items to roll discounts (#25915) 
* Job and Species Discounts

* Condensed procs

* No His Grace discounts

* Better crates, no discounts for 10 TC or lower

* Removes extraneous bits

* Removed excess null, fixed out-of-scope discount floor change

* Documentation, null check, and a lot of snakes

* Reworked logic of where it does job/species checks

* Curly brackets begone

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

* Curly brackets begone pt2

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

* Removed for loops in job-species checks

* No freebies

* Early continues

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
 2024-08-04 08:01:35 +00:00
DGamerL a21b962ee6 Flash refactor and rebalance (#25852) 
* Flash refactor and rebalance

* Maps

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

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

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

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

* Contra review

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

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

* Lewc Review

---------

Signed-off-by: DGamerL <108773801+DGamerL@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-04 07:55:17 +00:00
warriorstar-orion 3f75f3b8c3 refactor: Requests console directional helpers. (#26226) 2024-08-03 17:40:18 +00:00
Migratingcocofruit 8e05d86bc4 Uses the human damage procs instead of the carbon ones for vampire healing. (#26382) 2024-08-03 16:00:19 +00:00
Taurtura 03502a2a88 should have done that from the beginning (#26381) 2024-08-03 16:00:05 +00:00
Taurtura dab371d6a3 updates general blacklist comment (#26384) 2024-08-03 15:59:28 +00:00
Spaghetti-bit 6837ea7333 Caterpillars and Nymphs that evolve no longer provide blood to vampires and cannot be culted (#26174) 
* Makes nymphs and caterpillars immune to being culted after they evolve. Also makes them not give any usuable blood to vampires.

* Improves comments and changes the trait name.

* Update code/__HELPERS/trait_helpers.dm

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

---------

Signed-off-by: Spaghetti-bit <yumyumkillkill@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-08-03 00:07:33 +00:00
Mikhail Dzianishchyts d14a220023 Bring emitter locking back (#26374) 2024-08-02 19:48:57 +00:00
Spaghetti-bit aeb4395001 A high enough tint will blind you. You can no longer be flashed or blinded further if you have broken eyes. (#26338) 
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
 2024-08-02 18:13:12 +00:00
DGamerL 4787bf65e0 Refactors janitorialcart/attackby and removes a very duplicated proc on mops, lightreplacers and more (#26255) 
* Wohooo refactor

* Whoops

* Adds unequip

* Fixes

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

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

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Adrer <erwin@lombok.demon.nl>
 2024-08-02 18:08:06 +00:00
DGamerL 54b0c33144 Hahahahahahhaha (#26371) 2024-08-02 00:24:50 +00:00
Qwertytoforty b1432d3039 fix rigged powercell for modsuits (#26342) 
* fix powercell for modsuits

* Update code/modules/mod/mod_core.dm

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

* Update code/modules/power/cell.dm

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-02 00:02:57 +00:00
Qwertytoforty 217022fab7 Updates chem smoke to work visually again (#26361) 
* Updates chem smoke to work visually again

* Update code/game/objects/effects/effect_system/effects_chem_smoke.dm

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

* Update effects_chem_smoke.dm

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-08-01 23:53:16 +00:00
Faron 42c50a5cc5 Minor changes to table frames (#26313) 
* Update table_frames.dm

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

* Update abduction_gear.dm

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

* Update table_frames.dm

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

* Update abduction_gear.dm

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

* Update abduction_gear.dm

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

* Update table_frames.dm

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

* Update table_frames.dm

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

* Update table_frames.dm

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

---------

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

* Suggestion
 2024-08-01 15:11:53 +00:00
DGamerL 17640b22ec Makes incorporeal moving mobs immune to tipping (#26303) 
* Makes incorporeal moving mobs immune to tipping

* Lewc review
 2024-08-01 15:09:55 +00:00
Qwertytoforty 4d2171d41e [s] fixes that one baton bug again (#26365) 2024-08-01 15:06:00 +00:00
DGamerL 44671e31e8 Adds: The C-Foam launcher (#25738) 
* The start

* Getting a bit further

* Slight ammo casing update

* Istype helper and foam blockage

* Adds status effect

* Foam blockage and status effect fixes

* Autolathe ammo + stun

* aaaaaaaa

* Adds uplink item

* Actual slowdown

* Makes attacking a bit faster again

* Ammo increase to 12

* Sirryan review

* Adds sprites - almost working

* Lots of fixes + mineral doors

* Mineral doors don't open with foam
 2024-08-01 06:24:09 +00:00
1080pCat ca79f65c8d Adds a missing | to the player panel after "make super hero" (#26353) 
* Hold my brain, brain holder.

* Update misc_admin_procs.dm

* woops
 2024-08-01 01:01:55 +00:00