Commit Graph

2343 Commits

Author SHA1 Message Date
Vi3trice
59dfdba201 Everything else through the door (#19358) 2022-10-13 21:56:58 +02:00
S34N
db11313caa Fixes draggable bushes, sprite oversight (#19349)
* no drag the bush, and other tweaks

* im smart
2022-10-12 20:21:39 +02:00
GDN
313495d36e Puts paper on layer 3 (#19344) 2022-10-12 20:19:07 +02:00
Samman166
7d9ef94330 Adds mech cores, a component required by durands and gygaxs (#19136)
* added mech power core

* added a sprite to mech core

* properly adds a sprite

* Update code/game/mecha/mecha_parts.dm

Grammar changes

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

* removed starting cores from lockers and added one to RDs office one to Robotics

* Update code/game/mecha/mecha_parts.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

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

* Update code/game/mecha/mecha_construction_paths.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/mecha/mecha_construction_paths.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/mecha/mecha_parts.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Removed mech core from RDs there is now only one. Fixed some grammar things

* Update code/game/mecha/mecha_parts.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Update code/game/mecha/mecha_construction_paths.dm

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Grammar review

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

* Forgot one

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
2022-10-12 16:07:25 +01:00
Vi3trice
9e90c81282 Defining Part 1 - Code cleanup toward defines (#19262)
* This is only the beginning

* Update stack.dm
2022-10-10 20:50:29 +02:00
ElorgRHG
e843567671 Clothing (jumpsuit) DMI split, unused jumpsuit sprite purge along the way (#19092)
* Medical and RnD DMI files split

* Cargo DMI split

* Security DMI split

* Engineering DMI split

* Captain DMI split

* Civilian/service DMI split

This one hurt

* Forgot about this one

* Color DMI split

* Purges everything that was delted up until this point

... with a blindfold and a shotgun

* Dress and suit DMI split

* Pants and shorts DMI split

and merges pants and shorts files... shorts are pants, right?

* Donator/fluff jumpsuit clothing organisational relocation

* e

oops

* So this is used, repath bad

* Random commit

* Costumes DMI split and jumpsuits purge

* Some fixes

* pennywise

* Centcom DMI split

* SolGov DMI split

* Retro DMI split

* Syndicate DMI split

* Misc DMI split

* centcom officer

* Kills off uniform.dmi completely

* last fixes

* lastest fixes

* vox navy gold conflict

* civilian barber

* Tourist observers work now

* Hopefully working non-human humanoid clothing

* This being in suit.dmi is one of the reasons I made this PR

* This shouldn't be here

* Late night coding

* Pun Pun regains his drip

* Last fixes

* security/OFFICER

* Most important - clown fix

* working subtypes good

* Fixes chameleon jumpsuit

* Proper QM pathes

* Fixes jumpsuit rolling with the power of poor quality code

* Cargo tech character setup fix

* else instead

why didn't I do this in the first place

* PURP

* Fixes broken character setup job clothing

* CC suit fix

* Psychedelic jumpsuit proper path

* You must wear the jumpsuit to adjust it
2022-10-09 14:24:10 +01:00
Henri215
a44a9c764a Linen bin/ashtrays/coin presser tweaks (#19207)
* tweaks for linen bin and ashtrays

* Apply suggestions from code review

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

* deleted empty line

* coin presser can now be unfastened

* Update code/modules/mining/mint.dm

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

* suggestion

* rewind time

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
2022-10-06 09:58:27 -05:00
S34N
ca3910aa21 Tableing 2022: bartender's delight edition (#19202)
* tableing 2022

* del u

* code

* oh i should commit this haha

* idb2 are you okay?

* namae wa

* DIO
2022-10-06 09:42:17 +01:00
Contrabang
8418997ed8 Moves most screwdriver checks to screwdriver_act (#19024)
* screwdriver_act my beloved

* convert to returns instead of . / lewcc review

* it will be done

* i'm a little bit stupid, but now time to test

* sometimes I get excited and press the commit

* The great test has been completed

* oh wow oh wow, lewc review

* found one last one

* Steel review

* Lewc review

* quick sirryan review

* removes stupid comments (old coders I blame)

* sirryan review two

* whoops...

* hal review

* the fix to the fix to the fix

* Revert "the fix to the fix to the fix"

FUCK I pushed to the wrong branch
This reverts commit a96fe98781.
2022-10-06 09:30:33 +01:00
Contrabang
0766c5d2ae fixruntime (#19285) 2022-10-05 22:35:54 +02:00
Luc
6e3b9de54d Fixes icons maybe (#19244) 2022-10-03 11:14:01 +01:00
Vi3trice
e7e96ca391 Improve airlock and windoor assembly examine cases (#19137)
* Let's give some hints

* Update door_assembly.dm
2022-10-02 22:14:19 -05:00
Henri215
e56e10f31b added captain rubber ducky (#19131) 2022-10-02 21:12:20 +01:00
DevanStrife
f3e6ef7d2d Fixes #18882 and refactors for door assemblies (#19128) 2022-09-27 16:29:40 +01:00
Henri215
a2a92f33fc plastitanium and shuttle windows got buffed (#19062) 2022-09-25 13:16:55 -05:00
warriorstar-orion
4874032e80 Reset personnel locker overlays when lock/unlocking. (#19073) 2022-09-17 10:46:55 +01:00
Qwertytoforty
f9defc92bf Adds Fusion Gauntlets to RND (#18804)
* do a once over first

* merge conflict shit

* armor pen to modern stuff

* Apply suggestions from code review

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

* BOY SMELL THEM MERGE CONFLICTS

* icons / final changes

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-09-17 10:45:58 +01:00
S34N
ba802a199a Makes large jungle bushes use the tree transparency system (#18953)
* large jungle bush transparency

* size
2022-09-07 13:38:18 +01:00
Adrer
99c6945644 Window needs to be screwed to floor before being put in frame (#18935)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-08-31 13:22:14 +01:00
Contrabang
9e5999e8bc Allows toggling of crate locks with Alt-Click (#18906)
* wowee! easy of access!

* SR changes

* Revert "SR changes"

This reverts commit 1db0d2c1e6.
2022-08-31 13:16:50 +01:00
Adrer
9aed532f42 Improves thermal drill clarity (#18924)
* Improves thermal drill clarity

* Also remove progress bar on stop

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-08-30 18:09:46 +01:00
Vi3trice
b5955dc22d Expand electrochromic devices. Add airlocks, windoors, and window painter compatibility. (#18656)
* The future is hazy

* Deconflict and linters

* Update windowdoor.dm

* Update airlock.dm

* Update airlock.dm

* What was even the point of visible?

* Fixes

* Update tgui.bundle.js

* Update windoor_assembly.dm

* Update airlock_painter.dm

* Update tgui.bundle.js

* Ain't no wizard

* Update RCD.dm

* Tweaks
2022-08-29 11:07:38 +01:00
AffectedArc07
1c3dc66b79 Refactors light switches, igniter switches, mass driver buttons, and crematoriums? (#18683)
* A mixed refactor

* Re add link code

* tweak

* well thats embarassing

* Apply suggestions from code review

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-27 13:04:31 +01:00
ElorgRHG
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
S34N
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
SteelSlayer
358ff86ddb Removes the need for ComponentInitialize (#18833)
* removes `ComponentInitialize`

* mapload

* add back CRASH
2022-08-18 22:00:19 +01:00
Vi3trice
333e3a4f67 huh (#18848) 2022-08-18 10:47:50 +01:00
AffectedArc07
e80f0e1d8d Revert "Adds animations for picking up and placing items. (#18702)" (#18824)
This reverts commit 2945bed697.
2022-08-17 16:18:12 +01:00
AffectedArc07
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
Luc
2945bed697 Adds animations for picking up and placing items. (#18702)
* Add initial support for telegraphing item pickups

* Add interaction to lockers

* Undo some extraneous changes

* Make pickpocket gloves not show any animation on pickup
2022-08-14 15:52:04 +01:00
Qwertytoforty
7276267a94 Replaces vox O2 downside with vox only blood. (#18523)
* Replaces vox brute downside with vox only blood.

* I'm dumb, but at least I am not stupid

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

Co-authored-by: Adri <jozsef.adrienn@gmail.com>

* Add to medbay, cargo, makes blood colour work

* more readable

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

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

* spacing, removes == "Vox"

* test time

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

* makes it work and testing works

Co-authored-by: Adri <jozsef.adrienn@gmail.com>
Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-08-11 00:41:17 +01:00
Kugamo
3578f1854f oops (#18711) 2022-08-05 16:07:36 +01:00
S34N
3ff30d5067 Fixes railings and bot pathing (#18692)
* fixes railing bot pathing

* lol railing corners

* charlie optimisation

* AA
2022-08-04 14:20:36 +01:00
S34N
07265abdf2 Makes trees transparent if important objects are hiding behind them (#18627)
* tree!

* Update code/modules/admin/verbs/freeze.dm

* yeet

* steel review, animate transparency

* more critical items

* charlie review

* charlie
2022-07-31 23:24:12 +01:00
Qwertytoforty
daca998981 [TM READY] Ports lavaland elites from TG. (#18448)
* startup, expect like 50 unneeded icons, not bug free™️

* Hope works. Cloak works. Buffs for AI controlled. Faction fix.

* map speed buffs, fixes resummon health decay

* Adds roles. Adds Mirror walk. Nerfs revival, especialy for non antag summoned.

* I am denser than bluespace ore

* x2 antag cooldown, update desc for cloak

* removes 66% burn damage resist from elites

* honestly just knock that down

* herald not speaking right, fuckup with max hp fix

* Thanks hal!

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

* changes, changes, and more changes, oh my!

* Update code/datums/status_effects/buffs.dm

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

* GC stuff

* oh, and just one more thing

* no gibtonite gaming

* Huston we have a FUCKING PROBLEM

* oopsy doopsy

* but just one more thing (again, gc stuff)

* Lets all elites speak their mind

* NO LAVA

* grab ghost, legion charge red.

* dust the dusting from the code

* no mirror cargo shuttle crossing

* need to stop making small changes, x2 broodmother

* herald no longer crashes the MC

* Lower broodmother cooldown, herald down 5 brute and , legionare gets more smoke and thermals, pandora gets chasers

* remove extra brackets, x 2 on aoe squares

* pandora now respects factions

* fixes teleporting to tumor if reactivated by someone else. Herald has light, boost elites make message

* requested changes

* mirroring a wanted change

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-30 20:22:28 +01:00
Adri
c1376e08f8 Adds a lavaland and a space ruin, adds a "nest" structure (#18508)
* Adds goliath/grub lavaland ruin

* Adds syndicate drug lab ruin

* Fixes nest.dm issues

* Fixes APC init

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

* Satisfies linter

* Addresses AA review

* Addresses Farie and AA reviews

* Missed a \the

* Adds comments

* Made the warning message stand out more

* Removes redundant initial desc

* Moves APC vars out of init

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

* Replaces plating with airless plating

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-27 21:32:40 +01:00
Marm
f714946cd5 Differentbranchedition (#18527)
Adds hydroponics HUD to hydroponics locker
2022-07-25 00:02:32 +01:00
Kugamo
38f335e8b9 Big Fat Emission PR (#18124)
* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* Part 1

* rest of the airlocks

holy shit that took a long time

* part 2

* part 3

finale

* conflict resolution

* fixes warnings

* fixes paneloen airlock emissives

* adds back changes from #18145

* #18085 sprites

* SteelSlayer Review

readded process in status_display, idk why I removed it, it broke some functionality

* future proofing firedoors

Talked with the contributor who added emissive appearances to the codebase. As of now they wont block them unless they spawn as closed, but with future PR merges this code will work.

* solar panel PR conflict resolve

* pain

* small fix

* farie82 suggestions

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

* farie82 suggestions part 2

* farie82 suggestions part 3

* finalle

pog champ ers 2000

* farie82 suggestions the sequel

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

* SteelSlayer Suggestions

Co-authored-by: SteelSlayer <42044220+SteelSlayer@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-23 11:31:20 -05:00
Vi3trice
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
Contrabang
8631dd8561 direction chairs are back baby (#18477) 2022-07-20 18:15:48 +01:00
Viz
9596e6c9fc Zzztt... (#18389) 2022-07-17 11:53:34 +01:00
Christasmurf
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
Vi3trice
6dfaca81de Well no one's doing it (#18398) 2022-07-16 11:11:36 +01:00
Kugamo
3bfd1a6d8a Foggy Breath Effects (#18241)
* chilly

* frosty

* Now with crawling and buckling!

had to do some jank because meat spikes dont change a perfectly good variable that other angle changing code uses, so insert snowflake code for the meat spike. :C

* Fixes warning

what the hell is a protected variable anyways

* amogus

* Revert "amogus"

This reverts commit ebaa99c77b.

* megafauna PR deconflict

* removes jank

* needless variable def
2022-07-16 00:45:45 -05:00
Charlie
5e1ad2b560 Reworks disarms into shoves, mostly from TG (#18186)
* Disarm rework

* martial arts should work

* farie review

* bug fix + sound

* fixes all the things

* fixes diagonals

* fixes anchoring, buckling and adds feedback messages.

* fixes blockers ontop of tables

* grammar + tabling fix

* steel review
2022-07-15 13:14:38 -05:00
Bm0n
c0c8287ed3 I LOVE GITHUB!!! (#18308) 2022-07-15 11:44:16 +01:00
Kugamo
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
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
KalevTait
8dcf49855b Code Readability - Structures (#18273)
* structures

* requested changes
2022-07-10 14:00:25 +01:00
KalevTait
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