Commit Graph

2307 Commits

Author SHA1 Message Date
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
KalevTait
e53a53febf placing roller bed acts the same as expanding it in inventory (#18301) 2022-07-10 12:48:10 +01:00
KalevTait
38679890ca Deleting Unused Variables (Code Readability) (#18317)
* deleted

* was supposed to delete this before first commit
2022-07-10 12:47:51 +01:00
Contrabang
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
Sirryan2002
4195c9c9da fixes ponies shitcode (#18286) 2022-07-09 15:10:42 +01:00
Sirryan2002
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
Sirryan2002
a3ec899dfd logic fix (#18288) 2022-07-09 08:22:33 +02:00
S34N
1ad219e02a Revives "Updates ERT gear and adds holo stretcher #16266" (#18139)
* Updates ERT gear

* Apply suggestions from code review

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

* Reformats new vars

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

Code Clarity

Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>

* Removes unneeded item

* BULK

* repath time

* moxian review

* le beds

* haha webedits

* bubble review

Co-authored-by: warior4356 <warior4356@yahoo.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
2022-07-05 18:47:20 +02:00
KalevTait
e9133fe658 toilet init (#18146) 2022-06-30 22:32:13 +01:00
Charlie
bead47ea29 Adds crawling. (#17899)
* crawling?

* knockdown. CONTAINS CHANGES THAT NEED REVERTING

* plotting can_moves death

* CANMOVE IS DEAD

* mappers are insane

* removes todos as the are todone

* decreases crawling speed

* silly-con fixes

* surgery fixes

* fixes death

* pAI fixes

* removes var/lying

* runtime fix

* decreases default crawling speed

* correct crawling dir

* some more fixes

* stunbaton tweak, revert later

* rejuv fix

* restraint and incapacitated refactor

* crawling dir in line with TG

* fixes vehicle movement and grabs

* alien rest fixes

* antistun fixes

* fixed fall sounds

* forgor to stage this

* first review

* canmove zombie dispersal

* fix

* lots of fixes

* defines

* fixes the trait helper

* if you got no legs you can still crawl

* sillyconfix

* no reverty keepy

* jaunt fix

* hopefully fixes perma sleepy zzz

* admin rejuv temp fix

* rest canceling

* antistun chems now remove knockdown

* buckle offset fix

* fixes some stuff

* crawling delay = 4

* descuffs bed

* sleeping hotfix

* fixes simple mob resting

* V is the macro for resting

* projectiles no dodgy

* refines the projectile check

* god I hate strings

* MORE FIXES

* I hate buckling

* fixes capulettium plus

* winding down

* farie review

* bugs did stop showing up

* SEAN

* todo

* sean review

* ed209

* i HATE cyborgs

* steel review

* laaaaaast things

* reverts stun baton changes

* and done
2022-06-30 11:57:52 -05:00
Deniz
f1d743903b Bamboo drops wood (#18112)
* Bamboo drops wood

* Moved where its defined as per comment

* fixed the line spacing

* flammable
2022-06-27 21:12:53 +01:00
S34N
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
Contrabang
2dbff65258 Removes syringe guns, into the CMO locker (#18062) 2022-06-23 17:46:13 +01:00
S34N
10d0e2f230 New benches, colourable sofas (#17985)
* new benches, colourable sofas, directional beds

* removes bench corners

* slight sprite tweak

* inverse corners!

* removes rotatable beds due to mob jank and bedsheets

* fixes that one freaking always wrong cyberiad sofa

* make things use the in-built spraycan menu
2022-06-20 21:00:12 +01:00
Bm0n
85bb57adaf Window Banging Sound from TG (#17950)
* ha

* lowers knocking sound
2022-06-14 13:33:32 +01:00
Bm0n
537fed2de3 Ports TG's Grille (#17940)
* i just wanna grill for god's sake

* bye ceiling
2022-06-13 12:30:18 +01:00
13spacemen
b2a57c7637 changed the green medbay airlocks to blue ones (#17827)
green ones are now a new subtype virology airlocks
added viro airlocks to RCD, metal recipes, airlock painter
2022-06-09 12:32:03 +01:00
moxian
05c431b66a Allow construction of grilles on lattices (#17906) 2022-06-06 21:52:59 +01:00
Qwertytoforty
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
Charlie
0f7a8707ef [Ready] Refactors stuns and status effects. (#17579)
* Fixes reviver runtime

* Confusion status effect

* Dizzy status effect

* Drowsiness status effect

* decaying -> transient

* Drunkenness status effect

* why use timer when SSfastprocessing work good

* stuns (mostly)

* weaken and immobalise

* stun/weaken times

* update_flags redundancies.

* Slowed()

* Silence + fixes transient decay

* Jittery

* sleeping

* Paralyze -> weaken

* Cult sluring

* paralyse

* Stammer

* slurring + projectile cleanups

* losebreath

* Hallucination

* forgor this

* eyeblurry

* eye blind

* Druggy

* affected didn't like my spacing

* review pass

* second review pass

* some cleanups

* documentation and signal framework

* confusion fix

* Fixes spec_stun

* rejuv fix

* removes a TODO

* conflicted myself

* fixes

* self review

* review

* removes TODOs

* adminfreeze

* TM fixes

* hallucination fix + others

* tones down alchol and runtime fixes

* confusion overlay suggestion

* more fixes

* runtime fix

* losebreath fix

* clamp => directional bounded sum

* steel review

* oops

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

* reduces the dizziness cycle rate

* borg hotfix

* sanctified decursening

Co-authored-by: mochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-05-24 16:35:26 +01:00
Qwertytoforty
6522d3485c Stops bedsheets runtiming / being undeleteable (#17812) 2022-05-17 00:21:07 +01:00
AffectedArc07
e0758794a6 Removes shadowlings. Does not add anything else to compensate. (#17467) 2022-05-13 22:09:30 +09:00
Somniworld
c13535c2d0 Size change and deploying the roller bed on adjacent tiles (#17727)
Co-authored-by: Somniworld <pablo.capel4€@orange.fr>
2022-05-09 14:51:02 +01:00
Vi3trice
99050bad01 Add emissive, light source to vendors, smartfridges and dye generator (#17716)
* Glow my vendors

* Rack

* Update dye_generator.dm

* goofed on those 3

* Cleaned up the masks a bit
2022-05-09 14:50:38 +01:00
Kugamo
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
S34N
1e34507c34 fixes gun cabinets breaking with less than 3 guns (#17639) 2022-04-22 11:35:36 +01:00
meow20
3caf0667a6 Fixes movable window tint buttons (#17619)
* Update window.dm

* Update window.dm

* Update window.dm
2022-04-15 17:25:55 +01:00
Vi3trice
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
Vi3trice
ae76172934 Clean up crate code, and fix emagging making the manifest invisible and not making sparks (#17500)
* That's some janky stuff

* That wasn't supposed to be saved

* Updated to the new crate sheet. Still essentially just removing redundant sparks.

* I thought I did that already
2022-04-07 18:14:44 +01:00
Christasmurf
7f9cd8541b add icons and code (#17497)
Co-authored-by: Christasmurf <2543783+Christasmurf@users.noreply.github.com>
2022-03-21 17:09:30 +00:00
S34N
03beb422b2 Remaps CC, changes z1 layout (#17425) 2022-03-14 20:08:07 +01:00
ike709
f25787740a Fixes bedsheet bin update_icon() not working (#17486) 2022-03-14 18:47:49 +00:00
Dragonkiller93
6eeb6a1504 Borg locker verb fix. (#17408) 2022-03-09 14:13:22 +01:00
Vi3trice
137338f4dd Rework display cases to allow plain types, disassembly, and new sprites (#17406) 2022-03-09 13:58:57 +01:00
fakeyyy
25ebebb8a3 New barsign (#17455)
* Adds a new barsign.

* New flicker sequence
2022-03-08 11:35:23 +00:00
Vi3trice
976ebf123c Fix - Clockwork walls have the proper icons, regular and brass windoors can be properly disassembled, fix a windoor runtime and text (#17449)
* This is brass

* I reviewed myself and wound up finding more issues

* Whoa, lots of places where it calls it an airlock instead of a windoor
2022-02-26 12:55:09 +00:00
dearmochi
5693eb827e SSprojectiles - smoother and saner projectiles (#17127)
* SSprojectiles - smoother and saner projectiles

* trailing newline

* toki wo tomare

* Lower projectile speed back to 2x, reflector fix

* Tables stop projectiles properly
2022-02-25 18:30:05 +00:00