Commit Graph

1297 Commits

Author SHA1 Message Date
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
Viz
949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01: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
FloFluoro
444650ac7a Improved pizza bomb admin logging (#18466)
* Improved pizza bomb admin logging

* Adjust log message

* Nulls out refs on destruction
2022-07-20 22:12:41 +01:00
Viz
234a471cf9 Removes instant stuns from defibs, adds knockdown and stamina damage (#18456)
* fuck this

* initial and probably bad attempt at handheld defib

* let us give this an actual use

* it was bothering me

* i am a goofball sometimes

* i forgor

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

* charlie review 2

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-20 21:47:39 +01:00
KalevTait
694944e461 Code Readability - Power (#18245)
* power

* dissipate -> do_dissipate

* eye_protection =

* move APC charging #defines out of apc, and reference them in more places
2022-07-17 15:36:46 +01:00
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
KalevTait
f028d4a9bf Code Readability - Objects (misc) (#18276)
* objects misc

* requested changes
2022-07-11 20:28:27 +01:00
Viz
a02c0cb651 Removes the stun from flashes and gives them a cooldown (#18275)
* Like a tider in headlights

* witty commit name about cooldowns

* Chees- MY EYES!

* when your the the your the

* The name the the
2022-07-10 12:48:53 +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
b2bdb80ec5 Refactors Deathsquad, adds more customization to their spawning (#18135)
* a new coat of paint

* no shooting teammates on spawn for 100 damage

* datumization part 1, makes DS more OP, spacing fix

* hnng still broken but better

* breaks stuff less 99%

* mostly tgui

* oops, removes left over things from testing

* seperate tgui

* undo changes to ERT file and ERT manager

* build TGUI, front end is working

* minor fix, still broken

* this hurts me

* few small changes

* please dont fail

* mind code runs, but it doesnt work

* logging good, tgui built, will finish later

* mind code hurts, tgui should deconflict

* part one of giving up on TGUI

* 3 days of debugging, 2 lines of errors fixed

* no more unneccessary spawners

* Revert "no more unneccessary spawners"

* wow it works

* tgui, deconflict please

* a little clean up

* little more cleanup

* Sirryan addressed pt1

* Oops should commit this before the next commit

* DS isnt an option in one click antag, nuke it

* oops forgot this one small bit

* wow, simple code works

* oops, forgot to address, doesnt fix headset

* ds headset was broken long ago

* removes testing implants

* addresses requests

* get addressed code, you will be good

* few code improvements

* address moxian

* Makes deathsquad naming consistent

* this comment is true again

* a little precaution to stop AFKs

* no nuke code? no problem

* bing bam boom, more addressing

* no more runtimes I think

* clarified a few things

* gloves now show again following #18190

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

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

* okay I'm a bit stupid

* deathsquad jumpsuit desc update

* CI my beloved, have a fix

* deathsquad gets their proper icon

* Revert "deathsquad gets their proper icon"

This reverts commit a52519305b.

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-09 15:25:35 +01:00
AffectedArc07
3c00a1f061 Removes cortical borers. No, I am not sorry. (#18161)
* Removes cortical borers. No, I am not sorry.

* Icon purge
2022-07-01 23:25:01 +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
alex-gh
bc89d4e9cc Autopsy scanner no longer merges multiple autopsies into one when scanning one "Unknown" after the other. (#18066) 2022-06-24 13:14:27 +02:00
Mitchs98
2eae437689 unemps ur defib (#18021) 2022-06-22 00:55:59 -05: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
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
Adrer
2d8d26264d Allows engineering borgs to change painter type. (#17764)
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-05-10 22:13:41 +09:00
TrashDoxx
e04e0132b6 Some Tweaks & Fixes For Chameleon Projector (#17719)
* Minor Grammar Tweaks

* Fixes Some Exploits

* Code Style Tweaks

* Small Refactor

* Changes From Review

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

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-05-03 12:31:39 +01:00
SteelSlayer
e49b016df4 Updates the proximity monitor component (#15836)
* prox component update

* mochi review

* bug fix, makes proximity sensors always active

* GC fixes and removes an unused proc

* Disposal fixes from TM

* fixes runtimes when objects created in nullspace runtimes, fixes portable flasher

* a fresh perspective

* lewcc review

* adds comment about direct loc setting over forceMove
2022-04-30 15:50:36 +01:00
atteria
bcf90593ed Improves belt item overlay code, Adds new belt item overlay sprites (#17568)
* belt-improvements-and-sprites

* fixes my fix of botany belt allowed contents
2022-04-12 15:57:21 +01:00
S34N
487ae739cc Adds missing floors to the floor painter (#17210) 2021-12-13 18:29:47 +01:00
AffectedArc07
caffb4601e Fixes intercoms not working when in a comms blackouts (#17208) 2021-12-11 12:50:43 +01:00
AffectedArc07
2d5736a61c Removes brig phys, adds another officer slot to compensate (#17180) 2021-12-06 15:00:43 +01:00
S34N
2797b60bc1 Adds support for more "[dir] bump" mapping (#16908) 2021-12-03 08:10:11 +01:00
Charlie
31b336da64 minor external organ refactor (#16183)
Co-authored-by: SabreML <57483089+SabreML@users.noreply.github.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
2021-12-01 22:17:44 +01:00
SteelSlayer
93908eefc8 Antag datum clean up/refactor (#15084) 2021-11-25 08:29:46 +01:00
Fox McCloud
06df88706f Beginnings of Combat Changes: Ranged Weaponry (#17075) 2021-11-11 21:24:02 +01:00
variableundefined
62d0df33ea Merge pull request #16998 from lewcc/med-scanner-rads
Add radioactive message to health analyzer
2021-10-31 22:25:16 -05:00
lewcc
bbf92a4d1a to_char -> to_chat 2021-10-27 10:05:13 -04:00
lewcc
812b58acd7 Add note for user rad contamination 2021-10-27 01:40:41 -04:00
SabreML
945e00e497 IAA locker, spare headsets, and general locker cleanup (#16440)
* Locker + Bookcase tweaks

* HoS flask
2021-10-26 23:09:45 +01:00
Qwertytoforty
40eb870732 Polishes up and fixes bugs with the syndicate teleporter (#16844)
* Polishes up and fixes bugs with the syndicate teleporter

* snake case

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2021-10-07 16:38:23 +01:00
Farie82
2d13c33906 Makes laser pointers not go through walls (#16871)
* Makes laser pointers not go through walls

* Add comment

* Use the laserpointer instead as center
2021-10-04 20:15:10 +01:00
variableundefined
b44432b8b8 Merge pull request #16667 from Fox-McCloud/secborg-purge-borg-tweaks
Removes Secborg, Tweaks Borgs: Combat Rework Edition
2021-09-21 08:41:22 -05:00
Stokes52
119385057b Apply changes from AffectedArc's code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2021-09-19 07:43:00 -07:00
Stokes52
6c3675ad0c Add voice modulator mask for crafting and traitor uplink 2021-09-19 07:42:21 -07:00
Fox McCloud
2119063805 Removes Secborg, Tweaks Borgs, Adds Peacekeepers 2021-09-09 14:18:16 -04:00
AffectedArc07
fce2828724 Moves mutes to a GLOB 2021-09-07 15:09:37 +01:00
variableundefined
2354619f17 Merge pull request #16525 from S34NW/glass_floors_2
Glass floors attempt 2
2021-09-06 19:10:44 -05:00
variableundefined
dd17035c1f Merge pull request #16567 from SabreML/fluorescent-lights
Adds a short warm-up time when turning on a light
2021-09-05 16:05:21 -05:00
SabreML
6648d3131f Clothing Organisation V1 2021-08-24 18:37:48 +01:00
SabreML
1c14cf733b Light delay V1 2021-08-19 01:19:24 +01:00
S34NW
6234346ff0 Revert "Revert "Adds glass floors" (#16524)"
This reverts commit 517f5e8304.
2021-08-11 21:29:00 +01:00
variableundefined
517f5e8304 Revert "Adds glass floors" (#16524) 2021-08-11 21:18:49 +01:00
variableundefined
d8bfbe307a Merge pull request #15929 from S34NW/tgglassfloors
Adds glass floors
2021-08-11 16:08:09 -04:00
S34NW
fa88d21ae4 Merge branch 'master' into solgov_ERT 2021-08-06 15:47:40 +01:00
S34NW
ea87e351a2 Merge branch 'master' into tgglassfloors 2021-08-05 15:17:09 +01:00
hal9000PR
b2d46ba7bc fix (#16485) 2021-08-05 14:42:33 +01:00
S34N
e75d8357eb i touched the intercoms (#16483) 2021-08-05 10:55:17 +01:00