Commit Graph

9087 Commits

Author SHA1 Message Date
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
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
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
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
LetterJay
6ce5985f9f Merge pull request #5638 from Citadel-Station-13/upstream-merge-35775
[MIRROR] [READY]Randomized Station Time + Night Shifts
2018-02-24 00:24:47 -06:00
CitadelStationBot
4d42f68508 [MIRROR] Cleans up chem grenade copypasta'd code (#5675)
* Merge pull request #35913 from ShizCalev/chem_grenade

Cleans up chem grenade copypasta'd code

* Cleans up chem grenade copypasta'd code
2018-02-23 19:32:57 -06:00
CitadelStationBot
e85aa903a7 [MIRROR] Readds whisky sour & hearty punch mix sounds (#5676)
* Merge pull request #35904 from ShizCalev/mix-sounds

Readds whisky sour & hearty punch mix sounds

* Readds whisky sour & hearty punch mix sounds
2018-02-23 19:32:41 -06:00
EtheoBoxxman
043457c9f3 Blob update (#5624)
Ups the min players from 20 to 40 for a blob event to happen.
2018-02-23 19:19:39 -06:00
deathride58
2e84b30841 Makes martial arts use Knockdown() instead of Stun() for their stuns (#5617) 2018-02-23 19:19:23 -06:00
deathride58
759444c148 Removes xeno stun and stamina immunity (#5616) 2018-02-23 19:18:52 -06:00
CitadelStationBot
567c7fad8d [MIRROR] Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#5674)
* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold (#35796)

* - Stop subtracting from bodytemp please
- Also fixes shivering

* - Jesus christ why did you make me do this

* - missed one

* Fixes negative bodytemp in some cases and shivering not doing anything unless you're already very cold
2018-02-23 17:42:57 -06:00
CitadelStationBot
4351621e7d [MIRROR] Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#5673)
* Enables the RPED to construct/replace beakers, igniters and bluespace crystals (#35779)

* - Makes it possible to load the rped with beakers, assemblies and other such parts

* - Fixes cell ratings being not really related to desirability

* - sorry uhhh emp cells need to be slightly better than regular cells

* Enables the RPED to construct/replace beakers, igniters and bluespace crystals
2018-02-23 17:42:24 -06:00
CitadelStationBot
d96b280383 [MIRROR] Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#5672)
* Adds an dart-synthesizing dartgun for CMO/Chemist traitors (#35906)

* Syringe dartguns!

* Fix wording

* And then I said, 'I fixed it all!'

* Make it 12TC

* Adds an dart-synthesizing dartgun for CMO/Chemist traitors
2018-02-23 17:42:03 -06:00
KomradeSpectre
951a580759 Fixes a dumbo runtime error in the analyzer's barometer function. OOF. (#35902)
* Fixes a dumbo runtime error in the Barometer function. OOF.

* Moves butchertime stuff into a proc.
2018-02-23 09:07:53 -06:00
deathride58
21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733
[MIRROR] [s] Cameranet fixes
2018-02-23 13:21:23 +00:00
CitadelStationBot
80c2f30bd4 [MIRROR] Lets silicons disable morguetray alarms at a distance (#5669)
* Lets silicons disable morguetray alarms at range (#35855)

* Lets silicons disable morguetray alarms at a distance
2018-02-23 06:45:01 -06:00
Chayse Ramsay
dfe187ff1c Slimepeople bugfixes and rebalancing (#5649)
* Patching damage down to 3x to balance for Pooj's pressure damage increase

* Fixes a bug related to slime change potions

* Fixing conflict
2018-02-22 23:48:56 -06:00
Poojawa
743b1239bb Fixes dogborg offsets and gun layering (#5668)
* Fixes dogborg offsets.

* Fixes Dogborg laser overlays

* comment fix.
2018-02-22 23:48:24 -06:00
CitadelStationBot
099157b8ff [MIRROR] Renames neurotoxin2 (the toxin, not the drink) (#5666)
* fentanyl (#35882)

* Renames neurotoxin2 (the toxin, not the drink)
2018-02-22 23:43:23 -06:00
CitadelStationBot
afa88c7b31 [MIRROR] Makes the morgue alt-click message clearer (#5665)
* Update morgue.dm (#35883)

* Makes the morgue alt-click message clearer
2018-02-22 23:42:43 -06:00
CitadelStationBot
b66e76d97b [MIRROR] Fixes firelock deconstruction (#5664)
* Fixes firelock deconstruction (#35884)

* Fixes firelock deconstruction
2018-02-22 23:42:26 -06:00
CitadelStationBot
bc86d518db [MIRROR] Makes the detective's flask more noir-noire-noided (#5663)
* Makes the detective more noir-noire-noided (#35878)

* Makes the detective's flask more noir-noire-noided
2018-02-22 23:41:58 -06:00
CitadelStationBot
556961c08b [MIRROR] Fixes players killing themselves by whispering inside clone pods (#5662)
* shut the fuck up donnie you're out of your element (#35875)

* Fixes players killing themselves by whispering inside clone pods
2018-02-22 23:40:50 -06:00
CitadelStationBot
2809f4e694 [MIRROR] Admin-only extended AND speedy versions of revs (#5661)
* Admin-only extended AND speedy versions of revs (#35873)

* extendedrevs

* honk

* add speedy revs, testing

* nit

* Admin-only extended AND speedy versions of revs
2018-02-22 23:40:19 -06:00
CitadelStationBot
862a229652 [MIRROR] Removes input/output plates and their last remaining use (#5658)
* Removes input/output plates and their last remaining use (#35800)

* - Removes input/output plates and their last remaining use

* - ok fine updates the map too

* - loco loco

* Removes input/output plates and their last remaining use
2018-02-22 23:38:48 -06:00
cebutris
a39c0ef648 Revert "Slimes have no livers!" (#5655)
* Revert "Automatic changelog generation for PR #5633 [ci skip]"

This reverts commit c6ad3899d4.

* Revert "Slimes have no livers! (#5633)"

This reverts commit 07c7c5e6bf.
2018-02-22 23:38:04 -06:00
LetterJay
2ca33636d1 Merge pull request #5657 from Citadel-Station-13/upstream-merge-35901
[MIRROR] Toxin lovers properly take toxin damage from liver failure
2018-02-22 23:16:36 -06:00