Commit Graph

27107 Commits

Author SHA1 Message Date
Charlie Nolan
a5d780e4d7 Don't html-ize high rank admins in Discord. (#25117)
* More escaping fixes.

* Update code/__HELPERS/text.dm

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

* Apply suggestions from code review

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

---------

Signed-off-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-06 03:19:14 +00:00
BiancaWilkson
eb50355daf fixes a path (#25382) 2024-05-06 03:14:50 +00:00
Qwertytoforty
1150bdb265 fixes hecksuit (#25389) 2024-05-06 03:14:23 +00:00
HMBGERDO
9f7d4a128e fixing detaining mode (#25334) 2024-05-05 18:38:54 +00:00
Charlie Nolan
4949f0b71e Admin secondary goals will now unregister when deleted/completed. (#25171)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-05-05 18:32:29 +00:00
Qwertytoforty
274ff7b1c4 fixes sleepblind not being cleared if you are blind from othermeans (#25390) 2024-05-05 15:03:06 +00:00
Qwertytoforty
9ae66dd496 You can no longer see hud / screen when asleep. DOESN'T AFFECT BLINDNESS (#24360)
* You can no longer see hud / screen when asleep

* oh fuck the huds

* Update code/_onclick/hud/robot_hud.dm

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

* storing when looking into a bug

* more tweaks

* Initial screen object fixes

* fix for old screen types

* animation my dear watson

---------

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-05 09:42:12 +00:00
warriorstar-orion
526aea1e10 Add "docking area signaller", a device for creating new white ship docks (#24659)
* Add "docking area signaller", a device for creating new white ship docking ports.

* fuck it

* Apply suggestions from code review

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

* add span classes for to_chat

* fix plural check

---------

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
2024-05-04 22:23:54 +00:00
Arthri
4e036c77e3 /tg/ui Virology PanD.E.M.I.C 2200 (PanDEMIC) (#24533)
* /tg/ui PanDEMIC

* Fix types on booleans

* [ci skip]

* Fix oversights

[ci skip]

* Fix styling

* Apply suggestions from code review

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

* Apply suggestions from code review

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

* Remove unused field

* Optimize ui_data

* Make clone cooldown spin

* Change unit

[ci skip]

* Remove use of !!

* Fix Flex style prop accidental override

* Rewrite Stack to Flex

* Revert changes to Stack

* [ci skip]

* Build and update tgui

* Move force update code

* Build and update tgui

* trigger ci

* Fix style

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: Aylong <69762909+AyIong@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-05-04 22:10:53 +00:00
Qwertytoforty
38d16c4698 fixes bottler trying to produce a reagent that does not exist (#25374) 2024-05-04 18:42:40 +00:00
Burzah
00ec4ba7e2 Adds an admin message and logging for 'Crew Traitor' smite (#25323)
* adds an admin message for crew traitor smite

* adds additional admin logging for smite
2024-05-03 23:57:10 +00:00
Adrer
67cab8220a Fixes being unable to move objects out of your way when stuck. (#25358)
* You can once again move a pulled object out of the way

* Updated comment

* Comment split

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-05-03 23:20:55 +00:00
Сиротка
166dd00290 Vetus Speculator now tell you what type he is (#25316)
* Vetus Speculator now tell you what type he is

* Update ancient_robot.dm

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

Co-authored-by: Sheep <46016730+Scribble-Sheep@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: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: Sheep <46016730+Scribble-Sheep@users.noreply.github.com>
2024-05-03 23:19:14 +00:00
DGamerL
1263868238 Fixes a very old singularity bug (#25356) 2024-05-03 19:41:17 +00:00
CRUNCH
3126eaf97c Makes the Supermatter Announcements More Noticeable. (#25191)
* The SM is LOUD!

* Whoops.

* Hallucination

* Update code/modules/power/engines/supermatter/supermatter.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: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-03 16:58:36 +00:00
CRUNCH
654a48ab86 Xenoborg flash no longer disappears when burning out. Removes nonfunctional spray. Alters some descriptions for xenoborg items. (#25281)
* Alters some xenoborg stuff

* oops

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

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

* removes commented code

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-03 14:41:34 +00:00
DGamerL
5040dc286e Makes mentor PMs show up as mentor PMs again (#25351) 2024-05-02 23:49:04 +00:00
Contrabang
fe59ff5c3d adds more hand keybinds (#25225) 2024-05-02 23:33:24 +00:00
CRUNCH
073ad533fa Autodocs robot_mob.dm. Removes an unused proc. (#25331)
* Autodoc. Removes unused proc.

* removes a space

* Update code/modules/mob/living/silicon/robot/robot_mob.dm

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

* Update robot_mob.dm

* Update robot_mob.dm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-02 17:38:45 +00:00
Henri215
2144a93627 Mining charges, second try! (#24790)
* mining charges

* Apply suggestions from code review

Co-authored-by: warriorstar-orion <orion@snowfrost.garden>

* span class

* deconstruct comment update

* Apply suggestions from code review

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

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

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

* ops

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

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

* Apply suggestions from code review

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

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

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

---------

Signed-off-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-05-02 11:52:00 +00:00
Christasmurf
d587effe2c Beret + softcap .dmi split (#25314)
* beret softcap dmi split

* icon rename

* dme crlf to lf

* tsf cap fixes

* Apply suggestions from code review

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

* vox cap icon name

* remove beret subtype on fluff

* Update code/modules/clothing/head/soft_caps.dm

Co-authored-by: Henri215 <77684085+Henri215@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: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-02 11:37:44 +00:00
Divulf
15e7fcdb3f Improves barsigns and makes them buildable. (#24685)
* Improves barsigns and makes them buildable.

* Requested fixes.

* fingerprints and a parent call on attack_hand() (sure hope this doesn't break anything)

* More fixes.  (the change to barsigns.dmi is removing a bunch of almost-transparent pixels on the mead bay sign that shouldn't have been there)

* Even more fixes.

* Better code and sprite fixes.

* early returns

* better

* more

* switch

* qwertyuiop

* whoops

* maps are stupid

* mcramon sprites :o

* i hope mapmerge works this time

* i hope mapmerge works THIS time

* zrsxdctfhghfcdszzsxdgcfhv

---------

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-05-02 09:59:35 +00:00
Mikhail Dzianishchyts
ba4994d889 Tweak recipes of glasses (#25070)
* Tweak recipes of glasses

* Allow some sunglasses as ingredient

* Revert time of recipes
2024-05-02 00:35:39 +00:00
Mikhail Dzianishchyts
5ca09c7fe7 Don't walk without gravity while being space drugged (#25248)
* Don't walk without gravity while being space drugged

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

Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>

---------

Signed-off-by: Mikhail Dzianishchyts <mikhail.dzianishchyts@gmail.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
2024-05-02 00:27:10 +00:00
Adrer
24726c60fe Moving pulled objects as a borg checks if the turf is adjacent to you. (#25253)
* Move_Pulled now checks for adjacency of the turf you are moving something to.

* Move comment to correct line.

* Update code/modules/mob/mob_movement.dm

Co-authored-by: GDN <96800819+GDNgit@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: adrermail@gmail.com <adrermail@gmail.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2024-05-02 00:20:07 +00:00
Mikhail Dzianishchyts
45b0f34d95 Don't check side pressure if filter isn't.. filtering (#25019) 2024-05-02 00:06:23 +00:00
Charlie Nolan
50a986b8de Makes tesla movement pretty (#24786)
* They hate how easy this is

* No more deciseconds

* Intermediate code

* Made tesla movement pretty.

* Lint.

* Update code/modules/mob/mob_movement.dm

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

* Review comments.

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-05-02 00:04:50 +00:00
CRUNCH
e19559ad54 The Gibber Now Drops 6 Meat Instead of 3 When Gibbing. (#25287)
* Update gibber.dm

* extra
2024-05-02 00:01:24 +00:00
CRUNCH
1feb21eed1 [FIX] Cyborgs With Guns Can Now Perform Executions (With Guns!). (#25275)
* borg execution time

* Update gun.dm

* Update gun.dm

* Update gun.dm
2024-05-01 23:58:35 +00:00
Burzah
f8ebba6ed1 Adds logging for thrall deconversions (#25305)
* thrall deconversion logging inside water.dm

* moves logging to vamp_thrall.dm instead
2024-05-01 23:49:05 +00:00
Qwertytoforty
f0209d975b ion scatter gets 2 more pellets and 5 degrees more spread (#25269)
* ion scatter gets 2 more pellets and 5 degrees more spread

* mech ion as well
2024-05-01 23:46:42 +00:00
DGamerL
96aa08823c Adds it (#25254) 2024-05-01 23:23:31 +00:00
Arthri
af7f35a0fe Remove tgui say error (#25273)
* Remove the error

* Build and update tgui

* Restore precautionary if statement

* Build and update tgui

* trigger ci

---------

Co-authored-by: Arthri <41360489+a@users.noreply.github.com>
Co-authored-by: /tg/ui Builder <41898282+github-actions[bot]@users.noreply.github.com>
2024-05-01 23:23:26 +00:00
Qwertytoforty
a3a1be49b0 modsuits have the same virus protection as space suits / biosuits (#25310) 2024-05-01 23:23:19 +00:00
Qwertytoforty
daf76d3aaa gives lavaland plants 50 potency (#25322) 2024-05-01 23:23:09 +00:00
DGamerL
55ed33a253 Changes incorporeal_move to defines (#25319)
* Changes incorporeal_mvoe to defines

* Lets the switch use defines too
2024-05-01 23:23:03 +00:00
DGamerL
9d2c9d9ed1 Removes a variable that is only set once (#25003)
* One of the variables of all time

* Oyu review
2024-05-01 11:27:37 +00:00
Сиротка
86530f4e3e BUFF: Mining Grenade launcher (#25204)
* BUFF: Mining Grenade launcher

* Update weapons.dm
2024-05-01 10:40:48 +00:00
Charlie Nolan
14ce47830d Reduce the chance of getting no changes to a stat when mutating plants. (#25179)
* Reduce the chance of getting no changes to a stat when mutating plants.

* Update code/modules/hydroponics/seeds.dm

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

---------

Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-01 10:39:01 +00:00
larentoun
7daf219ec0 More Crowbar Acts (#24986)
* crowbar acts part 1

* livings checked

* convert istypes to tool behaviour

* solars

* use tool_volume

* Update code/modules/research/server.dm

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

* Update code/modules/power/generators/portable generators/pacman.dm

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

* return

* return returns

* Update code/modules/mob/living/simple_animal/bot/mulebot.dm

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

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

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

---------

Signed-off-by: larentoun <31931237+larentoun@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-05-01 10:37:08 +00:00
AffectedArc07
a2e7d95306 Moves a custom item to the right file (#25325) 2024-04-30 21:41:03 +00:00
Charlie Nolan
9271d9e106 Added tracking of when a secondary goal is handed out. (#25168)
Co-authored-by: FunnyMan3595 (Charlie Nolan) <funnyman@google.com>
2024-04-30 12:29:19 +00:00
CRUNCH
107950f50e Removes Advanced Reagent Scanner from Service & Medical Cyborgs, Transfers Functionality to Innate Reagent Vision. (#24457)
* Update robot_modules.dm

* Adds advanced reagent vision

* rounding

* Update code/datums/outfits/outfit_debug.dm

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

* Update code/modules/clothing/clothing.dm

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

* Update atoms.dm

* This one hyphen will kill me if I don't fix it.

* Update code/game/atoms.dm

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

* Update code/game/atoms.dm

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

* Update atoms.dm

* Update code/game/atoms.dm

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

* Update code/modules/clothing/clothing.dm

Co-authored-by: GDN <96800819+GDNgit@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: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
2024-04-30 11:51:15 +00:00
Zantox
ec2c5638fc Add ventcrawl unit-test (#24830)
* Add ventcrawl unit-test

* Fix linting

* Solve chair-flipping without HANDS_BLOCKED

* Remove unit_test_dummy variable

* Use `isturf` helper in ventcrawl unit-test

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

* Update code/modules/unit_tests/atmos/test_ventcrawl.dm

---------

Signed-off-by: DGamerL <108773801+DGamerL@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-04-30 00:57:36 +00:00
PollardTheDragon
3e9c29258e Diverse Traders (#24883)
* Diverse Traders Types

* Trader Type control, announcements, species spawning

* Trader Outfits

* Posh Moth - Posh Cane

* Landmarks, Trader ID Name Change

* Trader Shuttle Adjustment - Landmarks for Item Pools

* Outfit Survival Kit changes

* Added another refill for the hand labeler due to more cargo

* Trader Shuttle locker fix

* Item Stocks, Item Stock Assignments, Box Kits, Love Bottle

* Mech access, No double mechs, Small box fix

* Removed Solgov Gunkit from General Pool

* Spacing

* Moved traders to not be event subtypes, added documentation to vars

* Boxed spacing, removed improper

* Moved postequip, used box variables

* Lore team requested change - Bolt action instead of AK

* Changed landmark

* Moved soviet ammo to minor gear, increased soviet minor gear to 8.

* Obfuscated Cybersun

* Lootpool Adjustments

* Readded Solgov Kit to general pool at low weight

* Commas!

* Spelling

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

* Comments

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

* Re-Nulled After_Equip_Job

* Removed extraneous var spaces

* Relocated space in trader introduction message

* Robomoon is now once again Cybersun

* Impropered Enforcer Kit

* No more ERT box for non-NT boxes

* Fixed turbine kit stock part amount

* Subtyped skrell/unathi suit boxes

* Replaced meson cyber eye (nodrop issue) with meson sunglasses/gar mesons

* Reduced weight on arm/esword implant rare items

* Also reduced arm laser weight

* Added a couple items to skipjack large - more 'random', filled in reduced weights

* Path typo fix

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

* Removed trailing / in path

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

* Removed Cheap Breacher suit from inventory

* Apply suggestions from code review

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-04-30 00:51:19 +00:00
Luc
417d6fe8cf Makes kudzu much more likely to entangle you (#25167)
* lets kudzu entangle you

* Increase buckle time

* Apply suggestions from code review

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

---------

Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-04-30 00:50:35 +00:00
Сиротка
48db11cd84 Ash Walkers now Ash Doctors (#25207)
* Ash Walkers now Ash Doctors

* Update other.dm
2024-04-30 00:14:26 +00:00
S34N
2e4089dc15 Various TG Chat message sorting fixes (#25229)
* Fixes unsorted emotes, announcements, votes, surgery, prayers, ahelp responses

* Apply suggestions from code review

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

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-04-29 02:07:25 +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
Rayforx
83c9d8878a Blood level QoL for vampires (#25075) 2024-04-28 22:21:48 +00:00