Commit Graph

5194 Commits

Author SHA1 Message Date
Trevor Serpas 108f1c85ff Adds circutry to diagnostic hud, adds action flags to circuits (#35718)
cl
add: Circuits integrity, charge, and overall circuit composition is displayed on diagnostic huds. If the assembly has dangerous circuits then the status icon will display exclamation points, if the assembly can communicate with something far away a wifi icon will appear next to the status icon, and if the circuit can not operate the status icon will display an 'X'.
add: AR interface circuit which can modify the status icon if it is not displaying the exclamation points or the 'X'.
tweak: Locomotive circuits can no longer be added to assemblies that can't use them.
spellcheck: Fixed a typo in the grenade primer description.
code: Added flags to circuits that help group subsets of circuits and regulate them.
/cl

The diagnostic hud addition is meant to allow more counter play to circuits by seeing the assemblies's healths and how dangerous they are. The flags are a useful addition to the code because players shouldn't be able to put circuits in assemblies if the assembly can't use that circuit (this can also be used later for other assemblies which could use unique circuits).

The following circuits are flagged as dangerous:
weapon firing mechanism
grenade primer
thrower

The following circuits are flagged as long range:
NTNet networking circuit
integrated signaler
video camera circuit

possible AR interface displays:
default
alert
move
2018-02-19 22:07:16 -06:00
CitadelStationBot 1e65c813f0 [MIRROR] Extensive surgery additions (#5590)
* Extensive surgery additions

* Update role_preferences.dm

* Update surgery_step.dm
2018-02-19 10:48:11 -06:00
CitadelStationBot 7ef05e33ad [MIRROR] Mime's Bane recipe (#5592)
* Mime's Bane recipe (#35570)

* Makes Mimes's Bane use the new EMOTEMUTE trait

It randomly occured to me that I should do this.

Mime's Bane is currently a reagent currently only used in cloning pods
to stop growing clones from gasping from crit/lack of air (since they're
in a pure nitrogen environment).

* 2 Mime's Bane = 1 Mute Toxin + 1 Nothing

* Mutetoxin + nothing + radium

* Mime's Bane recipe
2018-02-19 10:23:20 -06:00
CitadelStationBot 74009632a2 [MIRROR] Fixed overlapping timestop behavior (#5591)
* Merge pull request #35784 from Cruix/timestop_overlap

Fixed overlapping timestop behavior

* Fixed overlapping timestop behavior
2018-02-19 10:22:59 -06:00
CitadelStationBot 177b808794 [MIRROR] Adds a space on check antag between name and role (#5589)
* Merge pull request #35683 from lzimann/checka

Adds a space on check antag between name and role

* Adds a space on check antag between name and role
2018-02-19 10:22:47 -06:00
CitadelStationBot 6e28b456ba [MIRROR] Deletes a redundant double proc definition in paper bins (#5586)
* Merge pull request #35797 from DaedalusGame/freon-is-back-baybee

Deletes a redundant double proc definition in paper bins

* Deletes a redundant double proc definition in paper bins
2018-02-19 10:21:47 -06:00
CitadelStationBot 5a532dd606 [MIRROR] Sheet icon fixes (#5585)
* Sheet icon fixes

* Update sheet_types.dm
2018-02-19 10:21:32 -06:00
Poojawa 97f69d6b05 Stop the fucking posibrain pinging, christ (#5584) 2018-02-19 01:04:15 -06:00
CitadelStationBot e3691b8857 [MIRROR] Fixes immersion, fried eggs now no longer requires boiled eggs (#5582)
* Update recipes_egg.dm (#35769)

* Fixes immersion, fried eggs now no longer requires boiled eggs
2018-02-18 19:52:54 -06:00
CitadelStationBot 773169564c [MIRROR] Fixes invincible blobs and blob nodes producing tiles after its death (#5580)
* Fixes invincible blobs and blob nodes producing tiles after its death (#35706)

* Fixes invinciblobs

* who put that there in the first place?!

* Update theblob.dm

* Fixes invincible blobs and blob nodes producing tiles after its death
2018-02-18 19:30:19 -06:00
fludd12 954bb7330e Sake! (#5538)
* Sake!

🆑 Fel and LeonDuvall
add: You can now drink sake! Can be found in the bar, or made with rice
and sugar.
/🆑

Sprites and idea courtesy of LeonDuvall.
Can be made with 15u rice and 5u sugar at 400k.

* Does the thing

Modularization of vending machines would require a lot more effort than
is remotely worth for such a simple change. Fortunately, not a lot of
new alcohols are added to it often, so it should be fine.
2018-02-18 19:26:55 -06:00
deathride58 fb289cfa5e Merge pull request #5571 from Citadel-Station-13/upstream-merge-35739
[MIRROR] Fixes bicycle riding
2018-02-19 00:46:57 +00:00
deathride58 7063a07e6b Merge pull request #5564 from Citadel-Station-13/upstream-merge-35760
[MIRROR] fixes flametrowers not being buildiable in the autolathe
2018-02-19 00:04:04 +00:00
deathride58 8c21545dd7 Merge pull request #5572 from Citadel-Station-13/upstream-merge-35344
[MIRROR] [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams.
2018-02-18 23:40:24 +00:00
CitadelStationBot c3f7fb219d [MIRROR] Makes the watcher wing crusher trophy less effective (#5573)
* Makes the watcher wing crusher trophy less effective

* Makes the watcher wing crusher trophy less effective
2018-02-18 17:40:00 -06:00
CitadelStationBot cdd8e1e590 [MIRROR] Removes one dotty boi (#5575)
* Removes one dotty boi

* Removes one dotty boi
2018-02-18 17:39:37 -06:00
deathride58 dac26732e2 Update packs.dm 2018-02-18 18:32:00 -05:00
deathride58 9bb0f20467 Merge pull request #5570 from Citadel-Station-13/upstream-merge-35738
[MIRROR] MMIs can now whisper without talking on the radio
2018-02-18 23:31:00 +00:00
deathride58 316cfb3ab4 Merge pull request #5569 from Citadel-Station-13/upstream-merge-35756
[MIRROR] [s] makes chemical mob spawning log
2018-02-18 23:30:33 +00:00
deathride58 12e8ca50b3 Merge pull request #5568 from Citadel-Station-13/upstream-merge-35746
[MIRROR] Actually fixes SCP 294 overlay problems
2018-02-18 23:30:20 +00:00
deathride58 51ee7ae43b Merge pull request #5566 from Citadel-Station-13/upstream-merge-35581
[MIRROR] Newliquors
2018-02-18 23:29:54 +00:00
deathride58 b996d9353a Update autolathe_designs.dm 2018-02-18 18:29:04 -05:00
deathride58 f35f20b0a1 Merge pull request #5563 from Citadel-Station-13/upstream-merge-35764
[MIRROR] RPED and crew pinpointer module upgrades for engi/medical borgs
2018-02-18 23:28:13 +00:00
deathride58 73ab0e7236 Merge pull request #5562 from Citadel-Station-13/upstream-merge-35763
[MIRROR] Removes unnused random event
2018-02-18 23:27:40 +00:00
deathride58 2651ff89d7 Merge pull request #5560 from Poojawa/snouts-and-things
Fixes some sprite issues
2018-02-18 23:27:08 +00:00
kevinz000 da8a12b906 [READY]Fixes hitscan beams going across the station, hitscan projectiles now properly cross zlevels and generate beams. (#35344)
* Cross Z support

* Fixes projectile cross-Z

* removes unnecessary code

* don't draw impacts if you're not impacting

* fix

* unneeded var

* No mapcheck()ing anymore, space does it for us 2.0
2018-02-18 11:34:29 -06:00
YPOQ e975cd3629 Fixes bicycle riding 2018-02-18 11:34:21 -06:00
coiax 78803f01a6 MMIs can now whisper without talking on the radio (#35738)
* MMIs can now whisper without talking on the radio

Fixes #35638.

* Otherwise, call super
2018-02-18 11:34:12 -06:00
kevinz000 a1074d361e [s] makes chemical mob spawning log (#35756)
* Rudimentary logging

* Update recipes.dm
2018-02-18 11:34:04 -06:00
vuonojenmustaturska cfdcabfe12 Merge pull request #35746 from MoreRobustThanYou/patch-60
Actually fixes SCP 294 overlay problems
2018-02-18 11:33:55 -06:00
Ordonis 1094e5b69e Newliquors (#35581)
* Adds a few new liqueurs and cocktails

How the fuck in THIS game of all games do we not have Triple Sec.
SERIOUSLY.

* Well there goes a one commit clean PR rip me

reeeeee

* Adds sounds, fixes colors

* Fixes recipies giving eggnog

Don't ask

* Adds space where space should be

* Travis stop stalling reeeeeee

* Fixes spelling mistakes

* Adds some health benefits to sec drinks.

Quadruple sec is mild, but easy to make; quintuple sec is STRONG but
more difficult.

* Fixes merge conflict annoyance

* FUCK

* Updates boozepwr of Quadruple/Quintuple sec

If someone ever adds sex on the beach as a cocktail, I fully expect them
to add in Sex-tuple Sec as well.

* Makes clowntears reagent explicit within food_reagents

Removed hacky solution, introduced better one
2018-02-18 11:33:37 -06:00
Tlaltecuhtli f4be7d0f5b fixes flametrowers not being buildiable in the autolathe 2018-02-18 11:33:21 -06:00
vuonojenmustaturska d4eab2acae borgmods 2018-02-18 11:33:12 -06:00
Leo f11a74e6f3 Removes unnused random event 2018-02-18 11:33:03 -06:00
Poojawa d154a302e1 Sergals don't actually have an extra snout layer 2018-02-18 06:49:30 -06:00
Poojawa d2d1315b13 fixes shepards, adjusts fox markings 2018-02-18 06:41:14 -06:00
Poojawa 3255bfbdbf sergal head stuffs
husky markings too
2018-02-18 04:48:02 -06:00
Chayse Ramsay 0b42003f53 Merge branch 'master' into QM-as-Head 2018-02-18 03:46:35 +00:00
deathride58 1447d4106f Merge pull request #5507 from Citadel-Station-13/upstream-merge-35478
[MIRROR] Added chemical reaction unit tests
2018-02-18 00:56:37 +00:00
Poojawa d85116abe7 fixes travis 2018-02-17 18:10:21 -06:00
Poojawa c0850044a7 Flightsuit Armor adjustments (#5515)
* armor tweaks

* marks the nerfs for future generations to respect.

* Modularizes values

flags are still getting trimmed tho.

* reee
2018-02-17 18:05:26 -06:00
Poojawa 7d488e8f4c Citadel'd Maps from #5523 (#5551)
* #5523 commit + sanity upload

* reee

* Syncs home brew CItadel changes

* updates cit_map_files

* reee.
2018-02-17 18:04:28 -06:00
CitadelStationBot b3266870a6 [MIRROR] Fixes some tool interactions (#5555)
* Merge pull request #35724 from DaxDupont/bordlisten-loves-the-cocks

Fixes some tool interactions

* Fixes some tool interactions
2018-02-17 17:46:46 -06:00
CitadelStationBot 7c036d7ca1 [MIRROR] Select Equipment works on observers (#5554)
* Merge pull request #35728 from coiax/select-equipment-on-ghosts

Select Equipment works on observers

* Select Equipment works on observers
2018-02-17 17:46:36 -06:00
deathride58 d2e13833d6 Merge pull request #5496 from Citadel-Station-13/upstream-merge-35339
[MIRROR] Support stations with multiple z-levels
2018-02-17 21:24:48 +00:00
deathride58 6a7d414fdf fixes compiling errors hopefully 2018-02-17 15:57:34 -05:00
deathride58 f072def90e Merge pull request #5533 from Citadel-Station-13/upstream-merge-35673
[MIRROR] All medal methods are handled on SSmedals as opposed to global procs and also have proper defines, killing with a crusher grants special medals.
2018-02-17 20:44:57 +00:00
deathride58 305849fba4 Merge pull request #5550 from Citadel-Station-13/upstream-merge-35726
[MIRROR] Reflectors now reset the range of a projectile like before!
2018-02-17 20:44:06 +00:00
deathride58 e9f6fb08bd Merge pull request #5539 from Citadel-Station-13/upstream-merge-35731
[MIRROR] Map spawned corpses start with their suit sensors turned off
2018-02-17 19:31:34 +00:00
deathride58 5374724165 Merge pull request #5535 from Citadel-Station-13/upstream-merge-35707
[MIRROR] Adds rainbow slime clusterbangs
2018-02-17 19:31:20 +00:00