Commit Graph

27734 Commits

Author SHA1 Message Date
Adrer de00530bd8 Bluespace closet no longer has a random offset when printed (#26827)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-09-19 02:26:34 +00:00
Qwertytoforty 479c80df0d the wizard voice of god no longer makes you drop your own items (#26794) 2024-09-19 02:26:23 +00:00
warriorstar-orion 63855ede3c fix: AI Eye movement runtimes (#26792) 2024-09-19 02:26:19 +00:00
Coolrune206 fb199c82b9 fixes saber spelling (#26766) 2024-09-19 02:26:03 +00:00
warriorstar-orion 89fd8c6454 refactor: ore bag pickup (#26699) 2024-09-18 16:56:33 +00:00
Qwertytoforty 9b0967a709 not my fault! (#26811) 2024-09-17 17:09:21 +00:00
Adrer 2f9182b6a6 [RUNTIME] Fixes trying to open the head marking menu for certain IPC heads. (#26701)
* You can no longer attempt to open the head markings menu for certain IPC heads with no possible markings.

* Added a TGUI alert

* Update code/modules/client/preference/link_processing.dm

Co-authored-by: Luc <89928798+lewcc@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: Luc <89928798+lewcc@users.noreply.github.com>
2024-09-16 14:54:50 +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
Sean 98912fcea9 More 516 fixes and TGUI improvements (#26617)
* more 516 fixes and tweaks

* cleaned build output

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-16 14:37:09 +00:00
Qwertytoforty 9caf53b45a Hoverboards will now get cursed if used during megafauna (#26695)
* Hoverboards will now get cursed if used during megafauna

* fix pixel offset

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

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

* Update megafauna.dm

* Apply suggestions from code review

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

* TIMER DEFINES

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

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

---------

Signed-off-by: Qwertytoforty <52090703+Qwertytoforty@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-09-16 02:49:43 +00:00
Luc 9e56381ab8 bleha (#26688) 2024-09-16 02:02:31 +00:00
ElorgRHG e2a7c805dd Paradise's soul removal part 7: engineering jumpsuits and accessories (#26641)
* Engineering jumpsuit resprite/refresh

* Engineering berets resprite/refresh

* CE mantle resprite

* Grey CE pants consistency fix
2024-09-14 07:01:30 +00:00
Kyani 32719e2f99 Adds map: EmeraldStation (NSS Diagoras) (#26438)
* fleshed out engi and asteroid

* command work

* more department fleshing out: sec

* sec work

* perma work

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* med and dorms fleshing out

* sci and service fleshing out

* Update EmeraldStation.dmm

* APCs done + detailing

* Update EmeraldStation.dmm

* wire work

* more wire work

* wires and LIGHTS

* ATMOS DONE now onto DECOR

* AI/status monitors

* intercoms and newscasters

* Wall items and cameras!

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* Update EmeraldStation.dmm

* moved the file to the correct area

* bugfixes, starting up the map

* refining the asteroid

* merge fixes

* logs of bugstomping

* more bugfixing

* bugfixing

* bugfixin

* trying to make the stupid lava work

* adds plasma vent for test

* more testing

* swapped file places

* vents work now!

* Update paradise.dme

* vent sprite update

* file corrections

* Asteroid MILLA changes

* adds a new MILLA atmos  type

* Build MILLA

* oopsie

* fixes

* removed testing code

* reverts map start

* reverts the atmos change

* respriting geyser

* comments

* Update code/__DEFINES/atmospherics_defines.dm

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

* Update geyser.dmi

* Update paradise.dme

* fixing past merges

* adds some missing items from merges

* reverting

* reverts changes again

* deleted unused file

* oops forgot nearspace areas

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/area/ss13_areas/engineering_areas.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Update code/game/turfs/simulated/floor/lava.dm

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

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

Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* Lots of map fixes

* Update EmeraldStation.dmm

* trying to unfuck the milla merge

* removed station from dme

* fixes/small tweaks/suggested changes

* removed errant turret

* redid telecomms

* Update EmeraldStation.dmm

* rebuilding everything

* redoing security

* more sec work

* perma shaped up + more items

* renamed properly this time

* resetting atmos code

* more secwork and move papers off varedits

* more secwork + dorms + funeral services

* added new areas + pipe/wires/floors

* security electrified windows/wires/alarms/lights

* cameras, dorms pipes/ires/alarms/apcs

* merged

* disposals

* lots of wall things + added map datum for testing

* pipe fix for linter

* fiddled with maints

* minor maint edits

* fixes + maint work

* more bugfix

* even more bugfixing

* MORE nearspace fixing

* dumb nearspace fix

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>

* a LOT of fixes + door access

* disposal pipe update  script

* oops linter fixes

* fixed viro button runtime

* finished maints + space decor

* removed hall light switches

* fixed solars areas

* removed errant lattice

* remove agent B from asteroid

* wall bump placement refining

* apc fix

* bugfixing

* minor maint change

* bugfixing

* burn tile on node fix

* changed official name

* bugfixing

* added genetics locker+figures

* bug hunting (buttons mostly)

* added firelocks. oops

* added temp webmap + bugfix

* Update emeraldstation.dmm

* new webmap. again

* added the perma tools

* nanomaps

* bug fixes, fixes, and more fixes

* more tweaks

* cable fix

* more bugfixing

* Update emeraldstation.dmm

* tiny fix

* fix AI sat turrets

* more bugfixing

* MORE bugfixing

* bugfix + ruins soundfile

* pipe bugfix

* fixed toxins pipes. junctions bad?

* swimwear :)

* remove errant QM gps

* rnd shutter button missing

* potato layering fix

* add bridge request console

* fix window tint in interrogation

* added some clothes

* nanomaps2, asset boogaloo

* modified an empty hall, added some perma cams, minor fixed

* forgot to save before push oops

* widens sci maint hall + bugfix

* gives theatre its autodrobe back!

* moved borg spawns

* moves nuke op default spot

* new asteroid mix + botany tweak

* adds cremator button

* new sign + moved pod + bugfixing

* cable fix

* engine, sci chem, and surgery tweaks

* more bugfixes and tweaks

* more tweaks

* adds a few windows back to robotics

* bar was missing pun pun!

* corrected misplaced atmos machines

* re-added the bathroom

* fixes atmos waste disposal injector

* modified mr potato

* changed bathroom area

* minor toxins tweak

* small wall decor tweaks

* removes errant lights

* removes errant opier

* LOTS of fixes/tweaks + adds CO2 to asteroid

* gave maint some boxes + cable fix

* duped brig lock

* adds masks to medbay storage

* adds missing gues passes

* cleanup from kitchen rework

* gives solars enough glass to complete it

* adds another defib to cryo pods

* makes asteroid sign fireproof

* perma maint now opens with virus + bugfixs

* bugfixing + adds missing holopads

* more holopads + bugfix

* adds some smoke vendors

* kitchen area tweak

* fixed errant rack

* rearranged/spread out cig vendors

* moved a cig machine again

* added RD tint button

* undid a brig area change

* removed errant posters

* added filing cabinets + bugfix

* maint morgue tray fix

* adjusted chapel + bugfix

* fixed palms + minor sec floor tweak

* adds forgotten magi and clown starts

* gave engi a shower

* reworked robotics + atmos bugfix

* geysers now work at 1/10 capacity when overpressure

* bugfixing + tweaked overrides/variables

* rework warden office

* bugfixes + adds some holopads

* added missing bio shutter

* more small tweaks

* adds RnD rework + gives mag some things

* fixed fabricators

* tweaked robo + added rnd server board

* added rnd backup circuit

* bugfixing

* bugfixing again

* bugfixing

* fabricator fix

---------

Signed-off-by: Kyani <65205627+EmeraldCandy@users.noreply.github.com>
Co-authored-by: paradisess13[bot] <165046124+paradisess13[bot]@users.noreply.github.com>
Co-authored-by: Charlie Nolan <funnyman3595@gmail.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2024-09-13 18:18:25 +00:00
Daylight a1e250ca10 dsquad and SST to 45 (#26705) 2024-09-13 17:43:29 +00:00
CRUNCH 9704445473 Farragus: Remaps Service Asteroid and Locker Room Area (#26493)
* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Much Work

* CI

* OSHA Exit Sign

* CI

* CI

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* CI

* CI

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Removed accidentally duplicated pipe.

* Update cerestation.dmm

* Update cerestation.dmm

* CI

* CI

* Update cerestation.dmm

* Update based on review

* Makes all service intercoms into cardinal bumps

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* Update cerestation.dmm

* fixes an errant loot spawner

* Update cerestation.dmm

* Moves bar electrical delivery wire to maint.

---------

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-13 00:49:11 +00:00
datlo 20f47a7f40 Adds Syndicate organizations (#24040)
* framework

* factions and objs done

* objective framework

* remove you_are, implement intro_desc

* assassinate syndi text

* remove extra space

* Apply suggestions from code review

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

* Implement steal items

* Apply suggestions from code review

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

* revert forced escape obj

* rename i var

* readd martyr check

* difficulty defines

* remove discounts

* add electra dynamics

* add hawkmoon

* repath org, add gameplay blurbs

* cuts unnecessary content, add org selection, updates

* move defines

* var names

* update numbers

* set defines, tweaks

* add hijack forced obj

* update L O R E

* remove forgotten todo

* document steal_list

* use initial()

* fix comments move steal objs

* apply code review suggestions

* use pickweight

* flags

* replace hardcoded target jobs by target_department

* comment fix

* incorporate org objectives into delayed objectives

* fix martyr check location

* Remove abuser vocab, debug names for orgs

* readd obj name as user, VV only

* add traitor panel and fix forced objective

* reword ARC objective

* change forced objective to list

* rewrite to US spelling

* Rework objective selection

* Apply suggestions from code review

Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* add hunter notification, review stuff

* Update code/game/gamemodes/objective.dm

Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Signed-off-by: datlo <quentinkoyote@gmail.com>

* fix lists

* Updated captain's sabre typepath

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

---------

Signed-off-by: datlo <quentinkoyote@gmail.com>
Signed-off-by: SteelSlayer <42044220+SteelSlayer@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>
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2024-09-12 19:08:21 +00:00
HMBGERDO 2b900840b3 Conveyer belts and Disposals units no longer steal items on nonhelp intents (#26717)
* no stealing batons

* belts too

* kick that unit
2024-09-12 17:37:46 +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
Contrabang 809769b181 Fixes and Changes for Devchat (#26726)
* whatever the fuck brat summer is i guess

* admins should get it too i guess

* i forgor tgui build for lightmode

* Update code/modules/admin/admin_verbs.dm

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

* Update code/modules/admin/admin_verbs.dm

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

---------

Signed-off-by: Contrabang <91113370+Contrabang@users.noreply.github.com>
Co-authored-by: BiancaWilkson <42818125+BiancaWilkson@users.noreply.github.com>
2024-09-12 17:08:48 +00:00
XFirebirdX 7c3d87d2b3 Update chameleon.dm (#26691) 2024-09-12 17:01:21 +00:00
Adrer f7472de36c [FIX] Floorbots now actually use the colour of the toolbox they were made of (#26730)
* Floorbots now actually use the colour of the toolbox they were made of

* Remove random newline

---------

Co-authored-by: Adrer <adrermail@gmail.com>
2024-09-12 16:59:46 +00:00
warriorstar-orion f67dbca14f refactor: use signal for explosion sensors. (#26703) 2024-09-12 16:59:09 +00:00
Mikhail Dzianishchyts a450ad9b9c Move global access procs to the mapping subsystem (#26664)
* Move global access procs to the mapping subsystem

* Apply requested changes
2024-09-12 16:58:31 +00:00
Mikhail Dzianishchyts d01fca6b26 Fix SMES not working after recharge (#26711) 2024-09-12 16:57:57 +00:00
dearmochi 512ec5c9dc Re-add removed toggle for prayer sounds (#26739) 2024-09-12 16:55:54 +00:00
Truls20 64f49e084f Update medical_designs.dm (#26723) 2024-09-12 14:29:43 +00:00
warriorstar-orion 716428dfbf fix: remove two unused vardecls (#26756) 2024-09-11 18:01:52 +00:00
Daylight 965b42bf51 [FIX] Cult Shadow Shackles can now cuff people who are missing an arm. (#26707)
* Copies the requirements from handcuff code

* This proc is never implemented

* Removes unused procs
2024-09-11 17:34:20 +00:00
XFirebirdX 4f6641c8ae Update hierophant_loot.dm (#26634) 2024-09-11 17:28:50 +00:00
warriorstar-orion 9a5db8f91e refactor: remove CanPass height arg (#26700) 2024-09-11 14:49:30 +00:00
Aylong 0ab96c50dc Patches resprite (#26626) 2024-09-11 14:00:10 +00:00
Paul a00a036841 add option to disable end of round sound (#26014)
* add option to disable end of round sound

* fix sleep position

* add EOR sound to enable/disable preferences

* invert logic so that existing players don't mute the sound

* fix inconsistent mute/hear variable

---------

Co-authored-by: pwbokie <pmerkamp@butler.edu>
2024-09-10 22:50:40 +00:00
Charlie Nolan 6c2d43ec5a Re-weighted secondary goals. (#26586) 2024-09-10 22:42:26 +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
DGamerL 35740a27cc Adds support for machinery to be bigger than 1x1 (#26531)
* Adds big machinery

* Remove debug stuff

* Even less debug stuff

* Contra review

* Complete refactor + BSH

* Reverts `/big`

* Adds missing *

* initial

* Removes unneeded shit

* Adds edge of world edgecases

* Whoops

* Fix

* Lewc review

* Make the grav gen better

* Render passes fix

* Extra comment in the toml

* Extra deconstruct just in case

* One less loop

---------

Co-authored-by: BeagleGaming1 <56142455+BeagleGaming1@users.noreply.github.com>
2024-09-10 00:50:59 +00:00
CRUNCH 33b2dc35fb Remasters the Clown-Mime Battle Ruin (#26539)
* Creation

* Improvement

* Fully wires up the SMES

* Update clownmime.dmm

---------

Signed-off-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2024-09-09 23:50:48 +00:00
WenlockTheBritishHobo 6257b9a54e Mime drink consistency (#26635)
* Makes Mime and Clown drinks heal IPC Clowns and Mimes too.

Previously, the four Clown and Mime drinks (Banana Juice, Banana HONK, Nothing, and Silencer) only healed organics. This commit should allow said drinks to heal IPCs too.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Pasted wrong code.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review to remove unnecessary code and to pass CI checks.

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

* Ensures robotic limbs are healed, also pass CI.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Previous commit broke something.

Going to try CRUNCH's suggested changes.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Apply suggestions from code review

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

* Should pass CI this time.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Put living back in.

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>

* Makes Mime Drinks consistent.

Changes Silencer to use the same check as nothing for the special effect.

---------

Signed-off-by: WenlockTheBritishHobo <168675688+WenlockTheBritishHobo@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+Fordoxia@users.noreply.github.com>
2024-09-09 23:49:23 +00:00
Mikhail Dzianishchyts 9e6cf97ebf Protect arrival shuttle from spacevine (#26567) 2024-09-09 23:46:29 +00:00
Kano c9193098cf Fixes being unable to ignite bonfire in lavaland (#26648)
* fire

* Update code/modules/hydroponics/grown/towercap.dm

Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>

* false

* span span

* one more

* define

* Update code/modules/hydroponics/grown/towercap.dm

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

---------

Signed-off-by: Kano <89972582+kano-dot@users.noreply.github.com>
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com>
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
2024-09-09 23:44:29 +00:00
MLGTASTICa 20d225809b The mech crusher module (#26550)
* E

* forgor this

* forgor this thing too

* add icons

* Update work_tools.dm

Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>

* Update code/modules/research/designs/mechfabricator_designs.dm

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

* Update code/game/mecha/equipment/tools/work_tools.dm

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

* my beloved , gone.

* misinput!!!

* Update code/game/mecha/equipment/tools/work_tools.dm

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

* Review compliance

---------

Signed-off-by: MLGTASTICa <61350382+MLGTASTICa@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: warriorstar-orion <orion@snowfrost.garden>
2024-09-09 23:41:51 +00:00
warriorstar-orion da4e51930f fix: R&D rework: convert rest of tgui_alert choices to lists (#26721) 2024-09-08 19:03:35 +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
DGamerL 2032afb65d Fixes extended thrower recipes (#26698) 2024-09-06 01:31:17 +00:00
DGamerL e3c73110db Adds Chemical flamethrowers (#25091)
* Initial work

* Good enough to open a PR out of draft

* Make these use the vars on the flamethrower

* Moar fixes

* Undefines define

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

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

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

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

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

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

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

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

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

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

* This won't compile

* GDN review

* Fixes CI

* Fixes CI even more

* 5 ammo per tile now

* Heavily nerfs adding multiple fires

* Adds phlogiston as a burnable reagent

* Fixes the fire name

* Placeholder sprite + ammo use fix

* Now in cargo partially

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* Lewc Review

* Adds nuclear variant

* Adds the chem flamethrower to the nukie uplink, alongside ammo

* More fire armor tweaks

* GDN review

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

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

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

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

* Apply suggestions from code review

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

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

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

* Update code/game/objects/items/weapons/chemical_flamethrower/fire_effect.dm

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

* TEMPORARY PUSH

* Adds inhands

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

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

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

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

* Fixes inhands

* Makes air hot again

* Lewc review

* Audible messages and canister refilling

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

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

---------

Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
Co-authored-by: GDN <96800819+GDNgit@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
Co-authored-by: 1080pCat <96908085+1080pCat@users.noreply.github.com>
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Burzah <116982774+Burzah@users.noreply.github.com>
2024-09-05 23:12:56 +00:00
Adrer 6ae5bfef8a [TWEAK] Makes vampire warning for burning in space a bit more obvious. (#26643)
* Makes the warning you're about to burn up in space a bit more obvious.

* Light -> Starlight

---------

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2024-09-05 23:06:56 +00:00
Sean 73e861b7c0 Dev team chat (#26669)
* dev team chat initial

* oops

* refactor who code

* allow discord relay

* yeet some un-needed stuff

* tweak the role colour

* Update code/__DEFINES/admin_defines.dm

Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Signed-off-by:  Sean <12197162+S34NW@users.noreply.github.com>

* .Add to +=

* Update config/example/config.toml

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

---------

Signed-off-by: Sean <12197162+S34NW@users.noreply.github.com>
Co-authored-by: ROdenFL <ROdenFL@yandex.ru>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2024-09-03 16:49:45 +00:00
BiancaWilkson e0da59f5ea Borgs get flashed again (#26674) 2024-09-03 14:01:11 +00:00
warriorstar-orion 3ef9abf196 fix: Unfrozen mobs keep their bodies. (#26663) 2024-09-03 13:19:39 +00:00
warriorstar-orion a2a1aa0489 fix: Standardize abandoned engi sat lockers. (#26654) 2024-09-03 13:18:46 +00:00
Сиротка 4e2b517298 Fixing syndicate tech on mining charges (#26639) 2024-09-03 13:17:06 +00:00