Commit Graph

9679 Commits

Author SHA1 Message Date
Marm
f714946cd5 Differentbranchedition (#18527)
Adds hydroponics HUD to hydroponics locker
2022-07-25 00:02:32 +01:00
moxian
70dbfc468d Fix gc issue with RD armor spawner (#18541) 2022-07-24 20:12:46 +01:00
Charlie
6ab9a133ba Reworks bolas. (#18383)
* bola rework

* energy bolas aint reusable

* re-adds sprites

* SPRITES

* fix bola bag

* range fix
2022-07-24 16:11:41 +02:00
moxian
e946c0b537 Switch guns and grenades over to /Initialize (#18332) 2022-07-24 11:44:42 +02: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
S34N
b27e2308c7 Refactors wiz teleport scroll (#18495)
* refactors wiz tele scrol;

* thingy

* spaces

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

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

* always true becom sometimes tru

* feedback

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-22 12:43:13 +01:00
Viz
949b73acf2 goodbye noobtrap (#18469) 2022-07-21 14:02:40 +01:00
moxian
51e5384299 Move clothing to /Initialize() (#18294)
* Move clothing to /Initialize()

* Farie review
2022-07-21 11:42:24 +02: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
AffectedArc07
20add76efb Refactors vote code (#18403)
* Vote refactor

* Tweaks

* Review tweaks

* Tweak
2022-07-20 22:13:41 +01: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
Contrabang
8631dd8561 direction chairs are back baby (#18477) 2022-07-20 18:15:48 +01:00
Viz
7e472658ab worlds most inconsequential fix (#18478) 2022-07-20 18:15:35 +01:00
Qwertytoforty
aea846c761 you can no longer attack c4 to ghosts (#18418) 2022-07-17 22:22:43 +01:00
Contrabang
0731101549 Gives cablecuffs and cables customizble colors, cablecuff(ed) sprites, and allows orange cables to spawn randomly (#18318)
* coloooors

* this should work

* bam, better colors

* fuck i didnt mean to delete the cueball

* cuffed state comment
2022-07-17 09:57:13 -05: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
Lumi
391a044df1 Grammar fixes (#18342)
* grammar fixes

cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -

* should fix the merge conflict

0 to FALSE

* unconflicts

panther will have to be fixed at a later date
2022-07-17 15:36:03 +01:00
Viz
9596e6c9fc Zzztt... (#18389) 2022-07-17 11:53:34 +01:00
Shadow-Quill
6d6af3742e Adds descriptions to library manuals (#18380)
* Adds descriptions to library manuals

* I swear, I can type!

* Apply suggestions from code review

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

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

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

Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-16 21:46:09 -05: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
Qwertytoforty
493571b901 fixes some issues with whetstones (#18307)
* fixes some issues with whetstones

* merges / simplifies / reorders

* can compress more.

* Active / wielded is no longer needed

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

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

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2022-07-16 00:04:19 -05:00
dragonpan2
1dc0669e12 expanded plastic crafting (#18281) 2022-07-15 20:32:48 -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
Qwertytoforty
acc48358b4 Adds a new mecha-fauna to lavaland. Ready to TM (#17999)
* pain

* more progress

* progress continues

* more progress™️

* saving progress while I swap brances

* leg moving working for real, woo

* more saving as power goes out

* eeven more

* fix transfer

* More changes, closer to pr ready

* final stuff for night backup

* almost done™️

* almost done

* Final changes to get ready for posting

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* new sprite

* Loot added (minus crusher loot)

* Apply suggestions from code review

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

* Defines, loot, and requested changes, oh my!

* Apply suggestions from code review

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

* sound, bluespace charge improvements, more text

* Update code/game/gamemodes/nuclear/pinpointer.dm

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

* WOOO CRUSHER ITEM

* don't code when dead tired kids

* Update code/modules/mob/living/simple_animal/hostile/megafauna/ancient_robot.dm

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

* Makes crusher loot work, reworks shield for mecha fauna

* Names it, lets it spawn, buffs it, should be ready.

* Adds better sprites.

* pick to rand

* Buff, prevent cheese.

* Merge conflict hook test

* double checking to see if I installed it or not, think I need to manual

* fixes the merge issue

* makes gibtonite not yeet the mechafauna as much.

* fixes hostile/hostile fuckup

* fix most beam issues

* extra qdel insurance but it should be good

* fixes chasm issues, beep on self destruct, extra bluspace charge

* Shrinks the kaboom.

* spelling + beam fix

* Apply suggestions from code review

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

* late_initialize, var names, and styling, oh my!

* attacl

Co-authored-by: AffectedArc07 <25063394+AffectedArc07@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-07-15 15:28:07 +01:00
Bm0n
c0c8287ed3 I LOVE GITHUB!!! (#18308) 2022-07-15 11:44:16 +01:00
Kugamo
490de764de colored belt cables (#18303)
😎
2022-07-14 16:52:35 +01:00
Qwertytoforty
3a3ee0941c fuck I am dense (#18377) 2022-07-14 14:53:26 +01:00
Shadow-Quill
ced4e1f1e3 Fixes not being revived if a ghost enters the body during a defib (#18371) 2022-07-14 11:01:49 +01:00
Sirryan2002
dcb4d43e5c Fixes Improper usage of tool_use_check proc (#18362)
* fix

* better implementation
2022-07-14 00:22:45 +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
S34N
3f95392c82 Lets go rebind things (#18166)
* SSinput Rewrite, Custom Keybindings

* hmm yes, safety

* azerty begone

* address AA and SteelSlayer

* Address the old man

* what

* CI dbconfig too

* Address TM issues

Unicode support
Better numpad support
Fix no perms message
Fix modifier screwing movement

* pre-TM tweak, nitfix

* pre TM change 2

* Display others

* MERGE ME

* unduplicates your rows

* reverts some changes, makes this work for now (not TM safe)

* fixes direction facing, removes hotkey help item

* weird keys

* TM commit revert later

* fixed asay/msay keybind

* adds ALL the emotes

* flip and spin

* makes old people happy

* and fixes admins not being able to msay

* lets borgs stow modules

* saves prefs when someone changes a keybind

* reverts skin changes and manually applies
HEAVEN HELP YOU IF YOU USE THE DM SKIN EDITOR IT BREAKS EVERYTHING

* tidies menu, unduplicates rest

* sql file pls come back

* Update SQL/updates/40-41.sql

* why did you not throw an error?!

* inits keybinds if your prefs somehow fail, i guess

* restores these spaces, i guess

* fixes local testing, i guess

* emote cooldown returns (oops)

* movement lock improvements

* Pageup does Swap Hands

* LOOC

* whisper for living mobs

* oops

* fix dsay

* fix IPC silicon emote hotkeys

* category name

* backspace only clears if input is focused

* Makes TAB and BACKSPACE rebindable

* charlie review

* define move

* yeet

* Lewcc review

* brings back legacy mode

* restores legacy mode

* tell legacy mode what is going on

* Update code/controllers/subsystem/input.dm

* Update code/controllers/subsystem/input.dm

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

* safeties!

* legacy mode is a pref now

* undo TM changes

* null prefs safeties

* Revert "legacy mode is a pref now"

This reverts commit b45af65139.

* revert this too thanks

Co-authored-by: mochi <shenesis@gmail.com>
Co-authored-by: dearmochi <1496804+dearmochi@users.noreply.github.com>
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com>
2022-07-13 21:34:41 +01:00
Adrer
d805668ccb Makes the Katana Bulky (#18338)
* Makes the Katana Bulky

* Makes katana bulky

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-13 21:18:30 +01:00
Contrabang
f0b048dd14 Renames the blob spawner to nuke disc respawner (#18130)
* no more blob, properly named now

* oops should have removed the comment too
2022-07-12 22:30:43 -05:00
moxian
f0768024d2 /obj/item/storage no longer uses /New (#18306) 2022-07-12 21:38:06 +01:00
Qwertytoforty
69a9206b78 Reworks the syndicate chainsaw (#18252)
* Reworks the syndicate chainsaw

* fixes merge conflict

* not work on dead people

* makes stun absorption removal respect stamina

* requested changes
2022-07-11 22:15:47 +01:00
KalevTait
f028d4a9bf Code Readability - Objects (misc) (#18276)
* objects misc

* requested changes
2022-07-11 20:28:27 +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
6a91840962 Code Readability - Weapons (#18171)
* weapons

* weapons

* prefer explicit time

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

* Don't have code on same line as control statement

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-07-10 13:59:33 +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
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
Qwertytoforty
258cac66c0 Removes the 357 revolver conversion kit (#18313) 2022-07-10 12:04:24 +01:00
Viz
55b6baad99 I'm gonna flip out (#18222) 2022-07-09 18:34:58 -05: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
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
Sirryan2002
4195c9c9da fixes ponies shitcode (#18286) 2022-07-09 15:10:42 +01:00