Commit Graph
50313 Commits
Author SHA1 Message Date
AffectedArc07andGitHub 1dfd637c80 [TGUI] Accounts Uplink Terminal (#14697)
* TGUI Accounts Uplink Terminal

* Mochi tweaks
2020-10-22 17:16:11 -04:00
AffectedArc07andGitHub b4d7d6c98e Fixes TGUI login exploit (#14695) 2020-10-22 11:07:48 -04:00
AffectedArc07andGitHub c0fad08097 Merge pull request #14692 from ppi13/beanie-fix-1
Sets correct sprite for the white east facing beanie
2020-10-22 10:04:18 +01:00
ppi13 3d11ab73f8 Sets correct sprite for the white east facing beanie 2020-10-22 05:38:32 +02:00
AffectedArc07andGitHub 38f3adee36 Merge pull request #14678 from variableundefined/tgui-sat
Update Satellite Control to TGUI
2020-10-21 23:24:40 +01:00
ppi13andGitHub 5fae70889b Gives beanies to vox (#14644)
* Gives beanies to vox

* Adds beaniestripedred
2020-10-21 18:21:29 -04:00
variableundefined aed98cab3e Fix merge conflict 2020-10-21 18:07:52 -04:00
QwertytofortyandGitHub 5ef7fdd0c0 Gives syndicate consoles syndicate bubbles (#14661) 2020-10-21 18:06:20 -04:00
QwertytofortyandGitHub 8afef30a4f Makes ablative armor always have a chance to reflect lasers (#14662)
* Makes ablative armor always have a chance to reflect lasers

* Gives it a description that it can reflect lasers anywhere on the user
2020-10-21 18:06:01 -04:00
QwertytofortyandGitHub 62068a341a Makes the supporting guardian not take more damage in healing mode (#14663) 2020-10-21 18:05:31 -04:00
variableundefined 2548d0f90a Address Affected concern and recompile TGUI 2020-10-21 17:43:20 -04:00
variableundefined c73706363c Update Satellite Control to TGUI 2020-10-21 17:43:10 -04:00
farie82andGitHub e4a94393d5 Makes revenants not able to interact with TGUI interfaces (#14689)
* Makes revs not able to interact with TGUI stuff

* Fixes the edge cases
2020-10-21 16:52:39 -04:00
AffectedArc07andGitHub 28f4b41486 Merge pull request #14686 from farie82/tachyonarray
[TGUI] TachyonArray/doppler array
2020-10-21 21:20:23 +01:00
AffectedArc07andGitHub 97dbb6a46a Merge pull request #14576 from Adrer/holodeck-furniture
Added holostools and actually mapped holo furniture
2020-10-21 21:14:07 +01:00
joep van der velden e98d19efde Review Fixes 2020-10-21 22:03:55 +02:00
AffectedArc07andGitHub 97693b70e4 Merge pull request #14688 from SabreML/admin-fire-alarms
Fixes being able to toggle fire alarms without 'Advanced Admin Interaction' enabled
2020-10-21 20:43:33 +01:00
SabreML c85fde6cae Update firealarm.dm 2020-10-21 20:32:43 +01:00
AffectedArc07andGitHub a6d333ab5e Adds user logging for emitter deletions + Fixes lobby tab (#14685)
* Adds user logging for emitter deletions

* Fixes something I broke with lobby too
2020-10-21 15:16:03 -04:00
joep van der velden ee644f7a6a Review change 2020-10-21 21:09:23 +02:00
joep van der velden 8cd8e473f3 Merge remote-tracking branch 'upstream/master' into tachyonarray 2020-10-21 20:47:04 +02:00
joep van der velden e5646dea23 TGUI TachyonArray 2020-10-21 20:42:24 +02:00
AffectedArc07andGitHub e5f0031d19 Removes lag for admins connecting at roundstart (#14684) 2020-10-21 13:26:35 -04:00
8b8dd8f620 Adds a number of new implants (#14348)
* adds CNS jumpstarter, hacking arm, janitorial arm and botanical arm implants.

* Update code/modules/surgery/organs/augments_arms.dm

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>

* Update augments_internal.dm

* Update augments_internal.dm

* error correction.

* new name for jumpstarter

* Update augments_internal.dm

* grammar

* taking some suggestions.

* adding a safe spraycleaner for the implant.

* more suggestions

* evenmoarsuggestions

Co-authored-by: RedWolfie <13683223+RedWolfie@users.noreply.github.com>
2020-10-21 09:52:11 -04:00
IrenandGitHub a3d01c18f7 PR - Gender Update (#14406)
* PR - Gender Update

Gives Gender three states instead of two. This allows clones of tri-gendered species to properly carry their genders over to new bodies (e.g. Greys, Drask, etc.).

Tristate Gender Set Proc
Tristate Gender Get Proc
Fixes where Binary State was needed.

* Update update_icons.dm

Yeah, let's _not_ have Genderless folks get inconsistently gendered body part sprites (e.g. head, groin, torso mismatch).

* Update dna2.dm

* Update dna2.dm

* Update organ_icon.dm

* Update update_icons.dm

* Update dna2_helpers.dm

* Update organ_icon.dm

Readability (spacing)

* Update dna_injector.dm

* Update dna2.dm

* Changes made per Affected's requests.

Changes made per Affected's feedback.

* Update dna2.dm

Got our heads too deep in using this just for DNA_UI_GENDERr - returning the Set and Get procs to 0, 1, 2 as per Affected's request.

While in there, noticed some housekeeping items:
- reorganized the ranges so they flow numerically now
- changed the ranges so they don't overlap (line 205 having been the worst)
- removed the "else" statement from line 222 since we're using ASSERTS. There shouldn't be a value outside the range of 0 to 2 for this.
2020-10-21 09:45:44 -04:00
f5a1a359a1 ERT Commander Rework (#14640)
* ERT Commander Rework

* instant = TRUE

Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-21 09:44:37 -04:00
f312297f9d A variety of minor food related fixes and tweaks (#14656)
* Changed Milo to Miso

* Update baked_goods.dm

* typo fix

* Revert "typo fix"

This reverts commit 3f6ca6a5b9.

* Revert "Revert "typo fix""

This reverts commit b67ed80d8d.

* Update food.dm

* removing beff and pepperoni

* adding onions as juiceable

* made drying grapes give you homemade raisins since homemade raisins were already in the code

* undo the onionjuice because it crashed my test server

* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge

* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)

* Moved onion rings to the deepfryer instead of microwave

* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)

* made macaroni and cheese names consistent

* moved two recipes to oven from microwave

* Wine comes from grapes ya dingus

* name fix

* made burger recipes consistent except for the big bite and super big bites

* yaki imo is baked whole sweet potato, not processed!

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm

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

* Update code/modules/food_and_drinks/food/foods/pizza.dm

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

* made food names consistently lower case

Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger

* Missed one

* Back to american mac 'n' cheese spelling

* Macaroniiiii

Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
2020-10-21 09:40:27 -04:00
AffectedArc07andGitHub 2c999ccef1 TGUI EFTPOS (#14683) 2020-10-21 09:36:53 -04:00
AffectedArc07andGitHub 8ee918761b Merge pull request #14677 from Kyep/gateway_fix
Fixes ghosts unable to pass gateway
2020-10-21 11:55:45 +01:00
8859634d3a Fixes Wryn's tail and adds the ability to sting (#14507)
* NanoMap Auto-Update (Mon Sep 21 07:07:21 UTC 2020)

* Wryn Sting

Wryn Sting code, Wryn Sting Button Icon Sprites

Co-Authored-By: Marginalorb <6353671+Marginalorb@users.noreply.github.com>

* Update actions.dmi

Co-Authored-By: Marginalorb <6353671+Marginalorb@users.noreply.github.com>

* further wryn fixes and some logging changes

* Changed Wryn Sting per Suggestions

Shout out to @SteelSlayer  and @FlattestGuitar  for their patience in teaching me how to make these changes possible!

Co-Authored-By: Marginalorb <6353671+Marginalorb@users.noreply.github.com>

* Fixes Trailing Newline in Body_Accessories.dm

* Update actions.dmi

* Nanomap fix

* I will try again and then I will try Affected's Suggestion Oh my God ReeeeeeEeeE

Co-authored-by: NanoMap Generation <action@github.com>
Co-authored-by: Kiyahitayika <69871346+Kiyahitayika@users.noreply.github.com>
Co-authored-by: Marginalorb <6353671+Marginalorb@users.noreply.github.com>
2020-10-21 00:32:53 -04:00
matttheficusandGitHub b0a324da4b Reduce Water Stun/Weaken Time (#14514)
* change water slips to be less painful

* change weaken to 1

* half'd original stun/weken time

* stun/weaken chaged to defines
2020-10-21 00:24:13 -04:00
moxianandGitHub ed9c3a22e1 Make floor painter UI nicer and move it to TGUI (#14635)
* Make Dropdown component use `selected` prop instead of state.

This makes the selection properly update when it's changed server-side.

* Make floor painter preview available directions nicely.

Also migrate it to tgui while at it.

* Have a preview of all available styles with pictures.

Also address the review comments.
2020-10-21 00:12:38 -04:00
TDSSSandGitHub 9b5aa2ea53 power/freezer now use power (#14657) 2020-10-20 21:30:23 -04:00
Kyep 9cc24b1ce4 LateInitialize() fix 2020-10-20 14:28:14 -07:00
Kyep e2a5c32bfa Better solution: let all ghosts transit the gate if off 2020-10-20 14:04:14 -07:00
Kyep abca80b8d8 Fixes aghost gateway lockout 2020-10-20 13:44:06 -07:00
AffectedArc07andGitHub e84e8ad0fa [TGUI] Shuttle Manipulator (#14674)
* TGUI Shuttle Manipulator

* Cleanus up artefacts
2020-10-20 15:25:53 -04:00
AffectedArc07andGitHub 0932f87fe5 Merge pull request #14673 from farie82/netherworld-link-fix
Fixes a runtime in the netherworld link
2020-10-20 12:14:37 +01:00
joep van der velden 24a4d7886e Fixes a runtime in the netherworld link 2020-10-20 13:08:42 +02:00
AffectedArc07andGitHub d31fdb28f7 Merge pull request #14672 from blinkdog/toggle-ghost-radio-once
Remove redundant ghost_radio preference handler
2020-10-20 09:32:29 +01:00
Patrick Meade ef443022cc Only need to toggle ghost radio preference once 2020-10-19 23:10:45 -05:00
moxianandGitHub bb42dca256 Fix runtime in eyes_shine (#14670)
Triggered by people with no eyes (say, slimes), but with an eye implant.
2020-10-19 23:27:22 -04:00
e320362409 fixes horrible loop in client/Topic (#14669)
Co-authored-by: Kyep <Kyep@users.noreply.github.com>
2020-10-19 23:26:54 -04:00
AffectedArc07andGitHub 22da0d5aea Merge pull request #14668 from dearmochi/speedfix-1
Disable debug message on get_valid_vent_spawns() parent being absent to prevent chat spam
2020-10-19 23:25:15 +01:00
mochi a4a0112208 Disable debug message on get_valid_vent_spawns() parent being absent to prevent chat spam 2020-10-20 00:18:22 +02:00
AffectedArc07andGitHub 19df15ad21 TGUI Mirrors + CMA (#14648)
* TGUI Mirrors + CMA

* Forgot this

* Farie tweaks

* Optimisations
2020-10-19 14:16:20 -04:00
AffectedArc07andGitHub 3e7481ba76 Fixes a few oversights with TGUI Central Atmos (#14660) 2020-10-19 13:13:46 -04:00
AffectedArc07andGitHub c825059dbe Merge pull request #14643 from moxian/foam-redspace
Foam darts should fall to the ground, not into nullspace.
2020-10-19 15:36:45 +01:00
AffectedArc07andGitHub 9b28f7ce76 Merge pull request #14652 from moxian/fridge-raid
Can no longer accidentally empty the whole smartfridge
2020-10-19 15:36:16 +01:00
moxian 79e892281f Smarftridge now gives items on release, not every second. 2020-10-18 22:24:12 +00:00