cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 09:31:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
60,132 Commits 26 Branches 2 Tags
c4cc00400db61077dbebb4c32ec3b752bb1ae56a
Commit Graph

7137 Commits

Author SHA1 Message Date
warriorstar-orion
5f814597a7 lint: forbid whitespace in empty list decls (#26972) 
* lint: forbid whitespace in empty list decls

* Update tools/ci/check_grep2.py

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

* close enough to grab a bunch

---------

Signed-off-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-10-21 19:28:21 +00:00
Chap
9120b40e81 Beartrap triggers on people that aren't flying (#27147) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-20 22:56:21 +00:00
Chap
c3d773402c [REFACTOR] Remove the flying var, adds the flying trait. (#26881) 
* Remove the flying var, adds the flying trait

* Remove flight when broomstick is unwielded

* Adds some comments

* tab indentation

* Fix carp flight

* Remove comment

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-16 17:46:19 +00:00
Chap
b51cc0f31c [PORT/FEATURE] Animated closet doors (#26832) 
* Adds animated closets

* Remove unecessary icon states and fixes secure closets

* Actually fixes secure closets

* Please our linting overlords.

* Fixes non-crate subtypes

* Update code/game/objects/structures/crates_lockers/closets.dm

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

* Moved legacy closet icons to seperate file

* Remove some unused variables

* GC

* Moved to proper destroy

* It's good when code compiles

---------

Signed-off-by: Chap <erwin@lombok.demon.nl>
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-14 14:05:16 +00:00
Luc
bd2a47eae9 Adds some more admin-focused cleaning reagents (#26796) 
* Add some bonus cleaning grenades

* clusterbusters too

* blocked chem list

* ignore clusters

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

Co-authored-by: CRUNCH <143041327+Fordoxia@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: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
 2024-10-10 13:43:07 +00:00
Chap
3c6e9bacad Stimulating steak no longer viable for kitchen secondary goals (#27038) 
Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-10 13:27:24 +00:00
Chap
a060093b59 [REFACTOR] Helper proc for unbuckling a mob (#26918) 
* Helper proc from unbuckling a mob

* Rename to unbuckle

* Minor fixes

* Move buckled up /mob/living

---------

Co-authored-by: Adrer <adrermail@gmail.com>
 2024-10-10 12:54:09 +00:00
PopeDaveThe3th
e657597b1c [LORE] Replaces most uses of "Russian" with "Soviet" (#26822) 
* no russian

* space

* more spaces

* Update walls_mineral.dm

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

* Update space_ruins.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@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: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
 2024-10-10 09:57:42 +00:00
kyunkyunkyun
9225cd5817 Security belts tweak (#26754) 
* Tweaking sec belts

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

Signed-off-by:  Sean <12197162+S34NW@users.noreply.github.com>

---------

Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Sean <12197162+S34NW@users.noreply.github.com>
 2024-10-10 09:57:12 +00:00
PollardTheDragon
46887a37f9 Thurible - Holy Incense Burner (#26713) 
* Thurible Code

* No Belt Slot

* No more emag act.

* Unholy water corruption fix

* Added jestosterone and nothing to acceptable reagents. Honk

* Item sprites

* Better bad chem purge messages

* Inhand Sprites

* Variable Format

* Formatting, Visible Messages, Inhand Updating

* Removed extraneous check

* Loc fix

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

* Readability of reagents var

* Guard clause on corrupted reagent addition

* Moved container type to vars

* Better check for sprite update

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-10 09:46:26 +00:00
Сиротка
a5a199392b Tweak: Revision of miners' and explorers' gear. (#26525) 
* Tweak: Revision of miners' and explorers' gear.

* Remove drake changes

* Remove armor-related changes

* Update machine_vending.dm

* Update machine_vending.dm
 2024-10-10 09:44:02 +00:00
PollardTheDragon
ff8e0404b9 New Mech - The Nkarrdem, Janitor Supreme (#26453) 
* Nkarrdem Mech - Initial Commit

* Fabricator category, garbage bag, module designs

* Added combat tech requirement to cleaning grenade launcher

* Fixed a comment's spacing

* Construction codersprites

* Construction path updated

* Open and Broken sprites

* Codersprites, Construction fixes, Wreckage

* Better spacing for equalities, better return bool

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

* Equality spacing

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

* playsound boolean fix

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

* Mech part comment spacing

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

* Parts list parenthesis spacing

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

* Spacing and boolean returns

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

* Another boolean return

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

* More comment spacing

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

* More comment spacing

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

* Ditto

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

* Comment spacing

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

* Comment spacing

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

* Snake cased floor_buffer, removed excess comment

* Enhanced floor buffer

* Whole lot of time format changes

* HUD warning message update

* Cutting cargo

* Max equipment fix

* Spray fixes

* Light replacer fixes and defines moved

* Mop sound cooldowns

* Formatting, autodoc, spacing, and chat alert fixes

* Emag warning

* Removed excess returns, added click when spray empty

* Minor refactor of cleaning_act, removed the async mopping

* Excess user

* Formatting, Typecaching

* Replaces to_chat with occupant_message

* Type def, attack log, and timer for CGL

* Moved light replacement logic to light object as fix() proc

* Free performance is free performance

* To chat fix

* replaceLight changes

* Ranged fix

* Moved autodoc

* Early return in mop refilling

* Reordered early returns in mop action

* Applied change to cleaning documentation

* Moved acrtion, removed excess subtype

* Spray moved to internal spray item, various fixes

* Removed excess

* Internal garbage storage for garbage magnet

* Janimech storage handling, effect when emptying into disposals, user check in handle_item_insertion

* Extraneous Return

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

* Var declaration fix

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

---------

Signed-off-by: PollardTheDragon <144391971+PollardTheDragon@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: Luc <89928798+lewcc@users.noreply.github.com>
 2024-10-10 09:40:48 +00:00
1080pCat
89bf882c98 Fixes eternal candle boxes appearing empty on spawn (#27008) 
* Fixes candle boxes appearing empty on mapload

* bad idea to blanket

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

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

* contra review

---------

Signed-off-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
 2024-10-09 19:03:35 +00:00
DGamerL
89796a055b Makes RemoveComponent more sane (#26877) 
* Makes RemoveComponent more sane

* An even better wrapper

* Update code/datums/components/surgery_initiator.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

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

* Update code/datums/components/_component.dm

Co-authored-by: Contrabang <91113370+Contrabang@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: Contrabang <91113370+Contrabang@users.noreply.github.com>
 2024-10-09 18:46:04 +00:00
Chap
3e640bd2c0 Remove user from do_install (#27039) 
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
 2024-10-09 17:31:47 +00:00
Paul
95b2d62e4f Captain's saber help intent slaps with flat of blade (#26869) 
* help intent with the saber slaps

* fix if statements to make papa linter happy

* misc code improvements suggested by contrabang

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
 2024-10-09 10:54:03 +00:00
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