Commit Graph

9714 Commits

Author SHA1 Message Date
Contrabang
d6b38aa9ff Makes defib shocks dangerous (#18809)
* wow this is funny

* remove prob at Hal suggestion

* lewcc suggestion

* hal review
2022-08-18 13:49:52 +01:00
Vi3trice
333e3a4f67 huh (#18848) 2022-08-18 10:47:50 +01:00
Qwertytoforty
432985b545 a cutting edge fix (#18849) 2022-08-17 22:33:01 +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
HMBGERDO
5c110b9745 uplink updates (#18800)
* uplink updates

* gives admin radio uplink 500 TC

* removing implicit var/

* fixing multiple uplink reference

* Update code/datums/uplink_item.dm

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

* Update code/datums/uplink_item.dm

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

* allowing admin uplink to buy hijack items without hijack objective

* i hate this file being in repo

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-08-17 10:54:47 +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
ParaGitV
56795960b7 Blood crawling (not the one you're thinking of) (#18759)
* Blood crawling (not the one you're thinking of)

* Update with alternative length

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

* More-Better checks

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

Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com>
Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-08-14 12:42:44 +01:00
AffectedArc07
34ed47ae74 Refactors stack traces, tiny bit of cleanup (#18773) 2022-08-14 02:11:40 +01:00
S34N
5162c0413c Fixes queued smoothing items not being removed on del (#18776)
* fixes queued smoothing items not being removed on del

* undupes the code

* why DID it do this?
2022-08-11 15:46:22 +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
Contrabang
ceb107860f Cleans up the universal recorder, shifts it away from verbs (#18519)
* recorder pt 1

* part 2

* consistency

* nuke that verb

* ruined comment

* fixes update_icon pt1

* update_icon_state()

* fix, address sirryan and moxian

* oops that should be 600 to function properly

* aaaa spacing

* Sirryan Review

* HAL review

* Hal review
2022-08-08 00:11:33 +01:00
HMBGERDO
fa89a07452 Disabling sounds on using Camera Bug (#18724)
* Disabling sounds on using Camera Bug

* Update code/game/machinery/computer/camera.dm

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

Co-authored-by: Charlie <69320440+hal9000PR@users.noreply.github.com>
2022-08-08 00:10:29 +01:00
moxian
e639b8acab /obj/item/reagent_container is Initialize (#18555) 2022-08-05 20:39:25 +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
901b07ef95 why (#18709) 2022-08-04 10:48:38 +01:00
Luc
2daa76e6fc Adds a special suicide action to air tanks (#18575)
* Add /tg/ tank suicide_act

* Review
2022-08-03 18:06:20 -05:00
S34N
964eeea4e9 3/4 perspective donut boxes (#18635)
* 3/4 donuts that are just as filling

* donert
2022-08-03 23:53:55 +01:00
Charlie
5a09895489 reverts #18618, fixing the melee attack chain (#18687)
* reverts #18618

* refixes the chainsaw
2022-08-03 23:33:36 +01:00
AffectedArc07
2da68e9b64 Atmospherics refactor (#18460)
* Atmospherics refactor

* META(GAMING)

* Cleanup

* RPD hotfix

* Fox review

* Do this

* Well that escalated

* Repath these

* Ah yes, scope creep

* Remove this comment

* Regression #1
2022-08-01 16:27:35 -04:00
Edan
1d552ab0e4 Armour Refactor (#18547)
* initial commit

* bullet fix + 100% armour pen

* equivalent armour values

* percentage armour pen

* updates bombing

* adds more defines

* i like armour too much

* review pass 1

* review pass 2

* updates with lavaland elites

* armour penetration value tweaks

* wt550 AP round change
2022-08-01 20:23:49 +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
PacifistDalek
f3035edb6f Pizza Overhaul 2022 (#18278)
* wip

* goodbye two pizzas

* commit to pizza time

* pizzaaaaaaaa

* getting there

* hopefully final

* pizza

* do you like me now CL?

* Update code/modules/food_and_drinks/recipes/recipes_oven.dm

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

* fixing suggestions

* Update paradise.dme

* back on track

* removing tablecrafting recipies, switch back to oven recipeis

* remove unused raw pizza sprites

* re-add KalevTait's suggestion

* fix merge conflict

* merge conflict fix i guess???

* i swear if this is still conflicted

* fixing trailing newlines

* moves parent calls

Co-authored-by: Sirryan2002 <80364400+Sirryan2002@users.noreply.github.com>
2022-07-31 23:23:32 +01:00
S34N
49e86ec4f6 Rebalances stunprods (#18640)
* zap

* BELT SLOT

* world's worst codersprite
2022-07-31 21:49:47 +01:00
roarbark
3f28b9fb25 turns hover over tooltips for inventory items into a preference (#18570)
* turns hover over tooltips into a preference

this allows people to toggle the tooltip boxes that appear when hovering over items

* adds up the bitflags in preferences.dm

oops

* coding late at night be like

fixes the bitflag, a variable location and the define name

* better wording and removes a var

cooler code
2022-07-31 21:36:32 +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
Sirryan2002
66a0369166 [TGUI] Labor Camp Points Manager (#18505)
* make changes do good

* implements requested changes

* Apply suggestions from code review

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

* Abstracts checks

* guh

Co-authored-by: Farie82 <farie82@users.noreply.github.com>
2022-07-29 08:46:57 +02:00
FloFluoro
9de96d0704 Replaces spraycan stun with knockdown (#18604) 2022-07-28 22:20:44 +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
Adrer
aaa6202a1a Changes energized fireaxe weaken to knockdown (#18543)
* Changes energized fireaxe weaken to knockdown

* Changes charge time and damage

Co-authored-by: adrermail@gmail.com <adrermail@gmail.com>
2022-07-27 21:26:47 +01:00
AffectedArc07
2f5cec832d Cleanup redundant machine stuff (#18494) 2022-07-27 21:25:39 +01:00
Viz
b9c25f3a70 warrenty (#18589) 2022-07-27 14:32:24 +01:00
FloFluoro
0981850f4c Fixes runtime when spraypainting xenomorphs (#18564)
* Fixes spraycan runtime

* Fixes incorrect type cast
2022-07-26 14:33:30 +01:00
Vi3trice
6b637363ea Fix BRPD exploit (#18566)
* wow

* Update rpd.dm

* Smokes cig
2022-07-25 16:09:47 +01:00
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