Commit Graph
743 Commits
Author SHA1 Message Date
ElorgRHGandGitHub 628748a1ee Adds garment bags to reduce locker clutter: Paradise edition (#18869)
* Garment bags

* Small prevention of gaming

* Larger prevention of gaming

* This looks better I think

* Holding a LOT of clothing in your backpack seems like a bad idea
2022-08-25 16:40:39 +01:00
S34NandGitHub 41813c3e5f Various fixes and QoL tweaks to labor camp (#18841)
* gulag QoL fixes

* escape route, analyzer

* stops people from spam calling the shuttle down

* unifies access

* moves ofitser, fixes point claim console

* TGUI build

* unifies point system for good

* TGUI deps

* tweak

* sirryan review

* hard ref removal

* more changes

* scope creep scope creep

* sirryan!
2022-08-25 16:36:36 +01:00
aba452f785 Refactors signallers, assemblies, electropacks (#18689)
* Refactors signalers, assemblies, electropacks

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

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

* Apply suggestions from code review

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-15 16:36:34 +01:00
MarmandGitHub f714946cd5 Differentbranchedition (#18527)
Adds hydroponics HUD to hydroponics locker
2022-07-25 00:02:32 +01:00
Vi3triceandGitHub f4b37b4177 Port TG updating appearances (#17943)
* Get pants that match or else you gonna look silly yo

* Posters

* Fix other hud elements

* Rereviewed

* Update shotglass.dm

* Fix for new merged PRs

* Typo

* Coming across other stuff

* Update theblob.dm

* No takebacksies

* smh i forget to leave a comment

* Updated for the detgun and cards

* Should have rerun langserver again

* No longer plastic, more in scope

* Damn you bluespace

* Reverting turret logic, out of scope at this point

* Tweak that part

* Went over energy guns again, and fixed UI White's sprite sheet

* Welding masks, glasses, and JUSTICE

* Update portable_atmospherics.dm

* Cleaning up, clearing things up

* Review and suggestions

* Update valve.dm

* More tweaks

* Missing character

* Not distinct lightmasks, so they can be overlays

* Update generator.dm

* Add parameter so holodeck doesn't try to make a perfect copy

* Update unsorted.dm

* Spiders

* Better fix for spiders, fix vamps too

* Ghosts

* Update telekinesis.dm

* Cleaning up old procs

* It's set up to not copy datums... Unless they're in a list

* Donuts, duct tape, and detgun. D3VR coming to Early Access

* Update procs that interact with doors so they call update_state instead

* Forgot one spot, and actually might as well just force lock

* Cleaning up other things... Sigh, and kitty ears

* oops

* Getting used to how it works

* blinds

* Going back to the suit obscuring thing, so it doesn't update all the time

* Missed that from merging master

* I made this PR and forgot about it

* Fix runtimes in cards

* Make things a bit more unified

* Update update_icons.dm

* yarn, really?

* Update library_equipment.dm

* Update shieldgen.dm

* Every time Charlie merges something, I go back and see if I can improve things further

* what's this? more?

* Update misc_special.dm

* wow, paper

* Review

* More reviews

* To be sure, seems like being broken messed something sometimes

* Brought airlocks closer to how TG works to iron out some stuff

* Pizza and morgue

* Doesn't seem to hurt, tried with holodeck

* Revert "Doesn't seem to hurt, tried with holodeck"

This reverts commit 158529302b.

* Icon conflict

* Fix organ damage

* Don't ask how. Why. It's like that on prod too.

* Cutting down on things and updating from TG.

* More flexible. Just in case the thing you stuck it on didn't destroy.

* Hydro was one the things I touched earlier on, better rework it

* Reviews

* Cleaning up further, also bri'ish

* Undo a change I did, and switch over to a more recent implementation

* Update biogenerator.dm

* Rolling back to old airlocks, but with new duct taped note

* Functionally the same. I'd just rather not have the smoothing happen there

* Went over APCs again

* Fix welding helmet names in species files

* Update airlock.dm

* Update persistent_overlay.dm

* Oh, topic
2022-07-21 08:11:59 +02:00
ChristasmurfandGitHub 51c1ef55ee Engineering Drip Lite™ (#18231)
* Merge remote-tracking branch 'upstream/master' into engiclothingpack

* In hand sprites

* satchel fitting
2022-07-16 20:39:26 -05:00
KugamoandGitHub b0c73f77ff Adds unique sprites for orange jumpsuit (#18180)
* YAHOOO!

map edits + 6 dmis + 4 dm LETS GO

* Adds prionser uniform to loadout

* Revert "Adds prionser uniform to loadout"

This reverts commit d64f1d49ae9cc2bf96d0c68621642b638f3d0276.

* restores changes

* Steelslayer Review
2022-07-13 16:43:37 -05:00
moxianandGitHub f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
KalevTaitandGitHub 6775604810 Code Readability - Crates_Lockers (#18270)
* crates_lockers

* use SECONDS where appropraite

* timer isn't in seconds, add a comment explaining that
2022-07-10 14:00:09 +01:00
ContrabangandGitHub 6a9b69fff8 Changes Coroners, Robotics, and RD lockers to be coded, not mapped (#18049)
* from maps to code

* robotics's headset moved into locker

* deconflicttttt
2022-07-09 15:30:16 +01:00
Sirryan2002andGitHub 4195c9c9da fixes ponies shitcode (#18286) 2022-07-09 15:10:42 +01:00
f2813a6730 Complete Library Overhaul Part 1 (#17832)
* first edits

* more commits yay

* more changes

* Update paradise.dme

* changes

* more edits

* more edits

* changes

* more changes

* changes

* more stuff

stuff

Update tgui.bundle.js

* FUCK

* Many UI changes

* Update Lib Computer UI and Correct Map Issues

* squashed commits :)

Guts Old Book/Manual Code and Reworks it
final (almost) touches

* this should pass tests now

* fixes random ruin having a removed object

* adds review suggestions

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

* squashed commits :)

update schema
adds python requested changes
implements proper python & sql scripts
applies some requested changes + minor fixes
bump SQL version to 40

Co-Authored-By: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

* applies requested changes from code review

* lets pass some tests today

more fixes

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* more requested changes fulfilled

* should fix map issues + a couple other things

* fixes & sanitization stuff

* Apply suggestions from code review

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

* updates UI and implements more requested changes

* mother of bug fixes & UI cleanup

* removes unused code

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* fixes

* adds GC checks

* Apply suggestions from code review

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

* requested changes + TGUI Cleanup and Styling

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Farie82 <farie82@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-09 14:55:12 +01:00
705578b23b Energy detective revolver (#17771)
* Initial defines

* more work

* icon

* more stuff

* UID not hard ref

* tidying

* overload go brrt

* le sound and dead cell

* delet gap

* initial chargepack stuff

* simplify

* oops

* yeet this

* placeholder sprites

* oops magic number

* the gun speaks!

* consolidation

* tweaking and tidying

* so long old gun

* icon purge

* reapplies placeholder

* 1 minute tracker, not two

* makes it use a pinpointer

* revert tiny map changes

* cease your tracking, fool

* oops

* soft refs

* charlie review

* projectile ref to firing obj, removes testing overrides
& cleans up signals

* some more UID null checks

* ICONS

* ICONS CONFLICT

* MORE ICONS

* makes it freaking work

* first pass fixes

* charlie review

* charlie review 2, variable boogaloo

* fixes holsters

* colours the overcharged shot

* and recolours tracker to be yellow to match charge

* yellow laser icon

* widen overcharge misfire %

* fixes unlinkable pinpointers

* fixes gun not speaking when tcomms setup is changed

* steel request

* no chargey

* loudening 2022

* steel part 1

* Apply suggestions from code review

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

* restores missing sprites

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-06-25 20:15:09 +01:00
ContrabangandGitHub 2dbff65258 Removes syringe guns, into the CMO locker (#18062) 2022-06-23 17:46:13 +01:00
e9e8c45839 Randomizes the reactive armor in the RD's office (#17888)
* Randomizes the reactive armor in the RD's office

* subtypesof

* Update code/modules/clothing/suits/armor.dm

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

* final stuff

* convert to initalize

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-06-02 22:47:11 +01:00
KugamoandGitHub 7189ae5d65 Janitor QOL (#17594)
* Yes

* No

suggested changes

* Maybe

Suggestions + water in cart sprites

* Merge Conflict Resolve

* Suggested Changes :o)

* fixes bugs

* suggested changes round 2
2022-04-22 11:39:21 +01:00
S34NandGitHub 1e34507c34 fixes gun cabinets breaking with less than 3 guns (#17639) 2022-04-22 11:35:36 +01:00
Vi3triceandGitHub b0f0ae91bc Add random critter crate, remove the unused crate subtype and tweak the animal hospital lavaland ruin to use new random crate (#17536)
* Let's stick with the closet

* Update crittercrate.dm
2022-04-12 16:06:34 +01:00
7f9cd8541b add icons and code (#17497)
Co-authored-by: Christasmurf <2543783+Christasmurf@users.noreply.github.com>
2022-03-21 17:09:30 +00:00
Dragonkiller93andGitHub 6eeb6a1504 Borg locker verb fix. (#17408) 2022-03-09 14:13:22 +01:00
37cba8b915 Adds seclite to the HoS' and the blueshield's lockers (#17403)
Co-authored-by: Adrienn József <93430361+Adrienn-Jozsef@users.noreply.github.com>
2022-02-17 09:50:17 +01:00
AffectedArc07andGitHub 2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
Fox McCloudandGitHub 27a4e47e91 Fixes Security Closets Not Having Seclites (#17120) 2021-11-16 23:13:02 +01:00
Fox McCloudandGitHub 55a6c23bc7 Removes civilian: Return of the Assistant King (#17103)
* Removes Civilian

* other alt-titles as well

* further resolution

* forgot these

* TGUI

* hud icon
2021-11-16 19:49:08 +01:00
variableundefinedandGitHub a5c65002b5 Merge pull request #17100 from Adrer/Cabinet-doors-2-electric-boogaloo
Fix cabinet doors 2: Electric boogaloo
2021-11-14 15:37:04 -06:00
variableundefinedandGitHub 2c5c495cd1 Merge pull request #17064 from Vi3trice/heres-johnny
Rework the fireaxe cabinet so it uses less sprites, and other tweaks
2021-11-14 15:32:41 -06:00
adrermail@gmail.com 531bb709b6 Fix cabient doors 2 2021-11-14 14:09:31 +01:00
Fox McCloudandGitHub 06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
Vi3trice 1a99534125 Oh fireaxe closet why you so bloated 2021-11-08 19:37:53 -05:00
S34NW 44d8d455bf merge conflict part 2 2021-11-01 10:18:51 +00:00
S34NW 1723e0b503 Merge branch 'master' into 3/4th-closet 2021-11-01 10:14:41 +00:00
Vi3triceandGitHub 758908e5ff CE closet has an RCD (#16820) 2021-10-26 23:32:38 +01:00
SabreMLandGitHub 945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440)
* Locker + Bookcase tweaks

* HoS flask
2021-10-26 23:09:45 +01:00
2908f321be Fix fireaxe cabinet not dropping the axe when destroyed (#16880)
* Move fireaxe item init later, make sure destroy properly forcemoves it too

* Normal locker code can clean up after itself

* Remove extra space, oops

* remove parent call

Co-authored-by: Farie82 <farie82@users.noreply.github.com>

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2021-10-09 16:47:52 +01:00
S34NW 5dc80d6cba steel pass 2 2021-10-02 22:26:37 +01:00
S34NW e78613e591 steel initial changes 2021-10-02 22:02:43 +01:00
AffectedArc07 129318891d Nukes spacepods and associated jobs 2021-10-02 13:16:24 +01:00
S34NW c860b48c22 correct overlay adding format 2021-10-02 00:49:15 +01:00
S34NW 83f8fbdfac locker door and open state trimming 2021-09-28 00:51:19 +01:00
S34NW 1c867b414c HERE COME THE CLOSETS 2021-09-27 19:33:42 +01:00
variableundefinedandGitHub fa3fa1dc6a Merge pull request #16579 from FlattestGuitar/armor-defines
Adds defines for damage flags
2021-09-17 22:10:20 -05:00
Mieszko Jedrzejczak 559fa37756 add defines for damage flags 2021-08-20 21:09:21 +02:00
E-MonaRhg 101551865f Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-08-14 17:42:06 +02:00
Fox McCloudandGitHub 9df0c803cc Merge pull request #16420 from SabreML/fire-nerf
Fire-safety closet extinguisher tweak
2021-07-27 13:11:17 -04:00
E-MonaRhg 4ee75ce29d Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-27 16:37:58 +02:00
variableundefinedandGitHub d91c8ba479 Merge pull request #15980 from AffectedArc07/toml-config
[READY] Converts configs to use TOML + Configuration refactor
2021-07-25 08:26:29 -04:00
SabreML 54797636a0 Fire-safety closet ordering 2021-07-24 23:55:33 +01:00
3417b51c9e Maps in the HoS hardsuit (#15637)
* Added HoS locker to all maps

* removes sneaky magboots

* Update code/game/machinery/suit_storage_unit.dm

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-07-16 16:13:46 +01:00
AffectedArc07 9ddf4ceb97 Merge remote-tracking branch 'ParadiseSS13/master' into toml-config 2021-07-09 11:42:23 +01:00
E-MonaRhg c303a2b3f2 Merge remote-tracking branch 'upstream/master' into just-defibrillator-things 2021-07-09 00:03:38 +02:00