Commit Graph

9110 Commits

Author SHA1 Message Date
CitadelStationBot
2c5b8a586b [MIRROR] Operating computers now display required surgery chems (#5701)
* Operating computers now display required surgery chems

* Rebuilds tgui
2018-02-27 05:05:02 -06:00
CitadelStationBot
5f6c41fa30 [MIRROR] Ports more operations to "tool_act" (#5718)
* Merge pull request #35854 from ACCount12/more_tool_act

Ports more operations to "tool_act"

* Ports more operations to "tool_act"
2018-02-27 05:04:27 -06:00
CitadelStationBot
4fed776e7e [MIRROR] Heart Attack Event Actually Works Now (#5717)
* Merge pull request #35928 from Robustin/brokenhearts

Heart Attack Event Actually Works Now

* Heart Attack Event Actually Works Now
2018-02-27 05:04:12 -06:00
CitadelStationBot
0ad6fe35e0 [MIRROR] [s] Fixes observers being able to create areas (#5724)
* [s] Fixes observers being able to create areas (#36006)

* Fixes observers being able to create areas

* Exception for admin ghosts

* [s] Fixes observers being able to create areas
2018-02-27 05:04:00 -06:00
CitadelStationBot
ff918707ee [MIRROR] Cleanbot fix (#5720)
* Cleanbot fix (#36003)

cl selea
fix: fixed floorbot
fix: fixed cleanbot
refactor: improved pathiding in case of given minimal distance;improved sanitation
/cl
closes #35995, #35919

* Cleanbot fix
2018-02-27 05:03:42 -06:00
CitadelStationBot
f7ade14cf7 [MIRROR] A Nar-Sie Plushie can be used an an extra invoker now! (#5723)
* A Nar-Sie Plushie can be used an an extra invoker now! (#35932)

* A Nar-Sie Plushie can be used an an extra invoker now!

you can't use 9 nar-sie plushies to invoke a rune, nar-sie plushies are only counted once

* Update runes.dm

* Update plushes.dm

* Update plushes.dm

* Update runes.dm

* A Nar-Sie Plushie can be used an an extra invoker now!
2018-02-27 05:03:07 -06:00
CitadelStationBot
b7d616250d [MIRROR] Fixes hitscans, and this time, properly (#5716)
* Merge pull request #35923 from kevinz000/i_betrayed_naksu

Fixes hitscans, and this time, properly

* Fixes hitscans, and this time, properly
2018-02-26 15:59:26 -08:00
CitadelStationBot
749f8c4e5c [MIRROR] Revert "Mekhi goes on the table" (#5715)
* Merge pull request #35980 from kevinz000/revert-35661-patch-483

Revert "Mekhi goes on the table"

* Revert "Mekhi goes on the table"
2018-02-26 02:38:53 -08:00
Poojawa
f7f3a600bd Removes Golem access to the station (#5692) 2018-02-26 00:20:37 -06:00
deathride58
509148f7f3 Merge pull request #5713 from Citadel-Station-13/upstream-merge-35930
[MIRROR] Blood Cult Conversion Fixes
2018-02-26 00:28:29 +00:00
MMMiracles
5493339c7d Adds Tinfoil Hats (#35665)
* adds a tinfoil hat to protect you from government conspiracies and aliens

* qutoes ples

* In the sheets of my sterilized room
In your comfy bed, air-conditioned car
There are vapors and toxins to get you all
In the water you drink, in the air that you breath
In the soil under your shoe

* conspiracy phobia, nodrop on hat once equipped, also CONTRAST

* a single comma

* cyberboss changes

* |=

* central typo fix
2018-02-25 18:11:48 -06:00
Robustin
6c8ee4f99e Blood Cult Conversion Fixes (#35930)
* Cult Fixes

* woops
2018-02-25 17:30:57 -06:00
LetterJay
fb705d7849 Merge pull request #5711 from Citadel-Station-13/upstream-merge-35960
[MIRROR] Oh, uhh, that isn't smoke! It's steam. Hamburgers have a 1% chance to spawn as steamed hams.
2018-02-25 16:59:56 -06:00
LetterJay
5978733f93 Merge pull request #5709 from Citadel-Station-13/upstream-merge-35977
[MIRROR] Fix bogus var access
2018-02-25 16:59:48 -06:00
LetterJay
d2607c0654 Merge pull request #5702 from Citadel-Station-13/upstream-merge-35639
[MIRROR] Refactors anti-magic into a component
2018-02-25 16:59:38 -06:00
Xhuis
919d7e2013 Steamed hams. 2018-02-25 16:38:39 -06:00
deathride58
c7760707e6 Update game_mode.dm 2018-02-25 16:43:54 -05:00
deathride58
621090d54d Merge pull request #5707 from Citadel-Station-13/upstream-merge-35840
[MIRROR] Removes liver unfailure and makes alcohol do the killing thing sometimes
2018-02-25 21:42:21 +00:00
deathride58
e721dfdc7c Merge pull request #5706 from Citadel-Station-13/upstream-merge-35754
[MIRROR] Fixes a runtime in "reference decoder" circuit
2018-02-25 21:41:54 +00:00
deathride58
44d8fd6085 Merge pull request #5705 from Citadel-Station-13/upstream-merge-35744
[MIRROR] Refactors butchering to a component - item-based butchering effectiveness, speed, and chances
2018-02-25 21:41:38 +00:00
deathride58
b0ca7f2aaa Merge pull request #5704 from Citadel-Station-13/upstream-merge-35667
[MIRROR] [s] Fixes tritium rad_pulse overload
2018-02-25 21:40:41 +00:00
deathride58
478c99b743 Merge pull request #5703 from Citadel-Station-13/upstream-merge-35657
[MIRROR] Circuit cloning balance: Timed cloning, reduced upgrade disk material cost
2018-02-25 21:40:25 +00:00
deathride58
a8e458188a Update inflict_handler.dm 2018-02-25 16:39:35 -05:00
deathride58
bee0f1a366 Update emplosion.dm 2018-02-25 16:39:16 -05:00
deathride58
bad80f8f54 Merge pull request #5700 from Citadel-Station-13/upstream-merge-35944
[MIRROR] Fixes first_death check
2018-02-25 21:38:02 +00:00
deathride58
86f30eaa6f Merge pull request #5699 from Citadel-Station-13/upstream-merge-35945
[MIRROR] Removes definition redundancy
2018-02-25 21:37:47 +00:00
deathride58
41fa7b67c7 Merge pull request #5698 from Citadel-Station-13/upstream-merge-35938
[MIRROR] Adds limitations to brain traumas
2018-02-25 21:34:45 +00:00
Tad Hardesty
3790df44e5 Fix bogus var access 2018-02-25 15:24:46 -06:00
BordListian
a75ac3bc13 Removes liver unfailure and makes alcohol do the killing thing sometimes (#35840)
* - Removes liver unfailure

* - MY LIVER FAILED INSTANTLY

* - Increases liver damage tenfold because whats the point of this pr if you need to drink 100 liters of the toughest booze in the game before you get liver damage

* - Fixes cyber livers not being twice as durable as ordinary livers
- Ok compromise alcohol does twice as much liver damage
- Fixes livers regenerating after they failed

* - I'll be happy if bacchus blessing destroys my liver and absinthe doesn't

* - I think this is the final number I'll punch in. I downed 14 shot glasses of vodka
2018-02-25 14:52:53 -06:00
ACCount
7c5e9f968f Fixes a runtime in "reference decoder" circuit (#35754)
* Adds "safe" option to hextostr and hex2num

* Fixes a runtime in ICs
2018-02-25 14:51:41 -06:00
Ashe Higgs
a7d5e4cdcf Refactors butchering to a component - item-based butchering effectiveness, speed, and chances (#35744)
* Butchering component

* auto-butchering based on toolspeed

* Gives drills their butchering back

* redoes toggles
2018-02-25 14:50:29 -06:00
Buggy123
924463b7a5 [s] Fixes tritium rad_pulse overload (#35667)
* Crashing the server is bad, mkay?

* BYOND PLEASE THIS IS KINDA IMPORTANT
2018-02-25 14:49:18 -06:00
Ashe Higgs
063fc1a7af Circuit cloning balance: Timed cloning, reduced upgrade disk material cost (#35657)
* Printing compromise

* Adds fast cloning to the upgraded printer

* sorry this took so long
2018-02-25 14:47:06 -06:00
XDTM
493623c827 Refactors anti-magic into a component 2018-02-25 14:45:51 -06:00
Jordie
51a70bcd4f Fixes first_death check (#35944)
* Update blackbox.dm

* Update blackbox.dm
2018-02-25 14:03:45 -06:00
Jordan Brown
1642f549ad Removes definition redundancy 2018-02-25 13:22:54 -06:00
XDTM
bd6e8f0bbb Adds limitations to brain traumas (#35938)
* Adds limitations to brain damage

* no need for these anymore

* a bit harder to gain traumas if you have some already

* (
2018-02-25 11:01:15 -06:00
YPOQ
4257c9ff5a Fixes gold slime extract reactions runtime (#35936) 2018-02-24 22:01:04 -06:00
CitadelStationBot
58413c4b54 [MIRROR] Renames various reagent IDs to be more descriptive (#5634)
* Renames various reagent IDs to be more descriptive (#35824)

* changes chloral2/beer2 names, fixes chloral2 desc

* reverts chloral2 name/desc, renames ling adrenals

* caPITALIZATION

* Renames various reagent IDs to be more descriptive

* fixes compile issues with Travis
2018-02-24 09:35:48 -06:00
Poojawa
4c637739a7 Applies ignore_walls = FALSE to dogborgs (#5691) 2018-02-24 08:34:23 -06:00
CitadelStationBot
913e94c128 [MIRROR] Black Fedora opens its inventory on-click like the Detective's Fedora (#5689)
* Black Fedora opens its inventory on-click like the Detective's Fedora (#35891)

* Black Fedora opens its inventory on-click like the Detective's Fedora

Instead of having to drag the sprite to your character to access its inventory, behaves the same as the Detective's Fedora opening its container on click. Considering some dets prefer the black variation for noir flavour rather than the brown standard one they just have to pass his flask from one hat to another.
I had either this in mind or creating a new black detective's fedora variant on the det's cabinet that also had the flask inside it.

The only other item affected by this, if I'm not mistaken, is the improper CentCom hat.

* Update internal.dm

Removed the <priority> line altogether to trim the code

* Black Fedora opens its inventory on-click like the Detective's Fedora
2018-02-24 07:02:57 -06:00
CitadelStationBot
b7015c379a [MIRROR] Cleans up some time stuff with DisplayTimeText (#5685)
* Cleans up some time stuff with DisplayTimeText

* Update hot_potato.dm
2018-02-24 07:02:45 -06:00
CitadelStationBot
26702fda91 [MIRROR] Makes new surgeries check for tool qualities (#5690)
* Makes new surgeries check for tool qualities  (#35847)

* Makes new surgeries check for tool qualities

* Gives augments and autosurgeon some tool_act love

* okay

* Fix duplicate definition

* Makes new surgeries check for tool qualities
2018-02-24 07:02:26 -06:00
CitadelStationBot
ece7f0e905 Adds two more drinks, Bastion Bourbon and Squirt Cider (#5681) 2018-02-24 06:11:45 -06:00
CitadelStationBot
3c7520f1f1 [MIRROR] Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#5687)
* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff) (#35879)

* adds an above lighting layer, adds lighting overlays

* fixes wonkiness with broken and burned lights

* decreases overlay alpha a tad bit

* i gotta test this - removes new() override from mutable_appearance

* readds /mutable_appearance/New() for legacy behaviour

* Makes light fixtures actually glow in the dark while on (And adds the necessary groundwork for other above lighting plane stuff)
2018-02-24 06:08:23 -06:00
CitadelStationBot
03cc105e90 [MIRROR] removes inaccurate comment for item/proc/equipped (#5682)
* Merge pull request #35918 from JJRcop/patch-16

removes inaccurate comment for item/proc/equipped

* removes inaccurate comment for item/proc/equipped
2018-02-24 06:07:49 -06:00
CitadelStationBot
3023fd874c [MIRROR] Fixes gas meter layering (#5686)
* Merge pull request #35877 from ShizCalev/GAS-METER-LAYER-FIX

Fixes gas meter layering

* Fixes gas meter layering
2018-02-24 06:07:07 -06:00
CitadelStationBot
f001f3aa4a [MIRROR] Readjusts doppler array formula for thermonuclear explosions (#5684)
* Merge pull request #35914 from DaedalusGame/every-bomb-is-precious-but-not-diamond-level-precious-did-you-know-that-diamonds-arent-actually-worth-anything

Readjusts doppler array formula for thermonuclear explosions

* Readjusts doppler array formula for thermonuclear explosions
2018-02-24 06:06:46 -06:00
CitadelStationBot
1f0a456085 [MIRROR] Reskinning objects now shows the possible appearances in chat (#5680)
* Reskinning now shows options in chat (#35910)

* Reskinning objects now shows the possible appearances in chat
2018-02-24 06:05:18 -06:00
CitadelStationBot
952dfb4be3 [MIRROR] Changes station time to real time rate multiplier from 24 to 12 (#5667)
* Changes station time to real time rate multiplier from 24 to 12

* Update ticker.dm
2018-02-24 06:04:47 -06:00