Commit Graph

14287 Commits

Author SHA1 Message Date
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
CitadelStationBot 4f5c793496 Automatic changelog generation for PR #5704 [ci skip] 2018-02-25 15:40:43 -06: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
CitadelStationBot b8559eed3f Automatic changelog generation for PR #5703 [ci skip] 2018-02-25 15:40:27 -06: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
CitadelStationBot 078833d187 Automatic changelog generation for PR #5698 [ci skip] 2018-02-25 15:34:47 -06: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
deathride58 92233ab56e Merge pull request #5695 from Citadel-Station-13/upstream-merge-35936
[MIRROR] Fixes gold slime extract reactions runtime
2018-02-25 21:34:24 +00:00
CitadelStationBot ba7b5657a5 Refactors butchering to a component - item-based butchering effectiveness, speed, and chances 2018-02-25 14:50:29 -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
CitadelStationBot 9b16a199e6 [s] Fixes tritium rad_pulse overload 2018-02-25 14:49:18 -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
CitadelStationBot ebc4889231 Circuit cloning balance: Timed cloning, reduced upgrade disk material cost 2018-02-25 14:47:06 -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
CitadelStationBot 0f0907d10d Fixes first_death check 2018-02-25 14:03:45 -06:00
Jordie 51a70bcd4f Fixes first_death check (#35944)
* Update blackbox.dm

* Update blackbox.dm
2018-02-25 14:03:45 -06:00
CitadelStationBot efb3d45bf6 Removes definition redundancy 2018-02-25 13:22:54 -06:00
Jordan Brown 1642f549ad Removes definition redundancy 2018-02-25 13:22:54 -06:00
CitadelStationBot 378d492c47 Adds limitations to brain traumas 2018-02-25 11:01:15 -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
CitadelStationBot 1964aa0d6f Fixes gold slime extract reactions runtime 2018-02-24 22:01:04 -06:00
YPOQ 4257c9ff5a Fixes gold slime extract reactions runtime (#35936) 2018-02-24 22:01:04 -06:00
CitadelStationBot 0589c06507 Automatic changelog generation for PR #5634 [ci skip] 2018-02-24 09:35:50 -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 42713c97f0 Automatic changelog generation for PR #5689 [ci skip] 2018-02-24 07:02:59 -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 b2ea3ea668 [MIRROR] Fixes cats growing collars when resting (#5688)
* Merge pull request #35926 from ShizCalev/cat-collar-fix

Fixes cats growing collars when resting

* Fixes cats growing collars when resting
2018-02-24 06:25:43 -06:00
Poojawa ab8ccef9b8 Missing drink icon from #5681 2018-02-24 06:13:17 -06:00
CitadelStationBot 5721a12d66 Automatic changelog generation for PR #5681 [ci skip] 2018-02-24 06:11:47 -06:00
CitadelStationBot ece7f0e905 Adds two more drinks, Bastion Bourbon and Squirt Cider (#5681) 2018-02-24 06:11:45 -06:00
CitadelStationBot 5776be9c1e [MIRROR] Fixes unicode changelog tags (#5679)
* Fixes unicode changelog tags (#35905)

* Fixes unicode changelog tags
2018-02-24 06:11:09 -06:00
CitadelStationBot 84abe79303 Automatic changelog generation for PR #5687 [ci skip] 2018-02-24 06:08:25 -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 456d01dd38 Automatic changelog generation for PR #5684 [ci skip] 2018-02-24 06:06:48 -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 5d7e0cc301 Automatic changelog generation for PR #5680 [ci skip] 2018-02-24 06:05:20 -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
CitadelStationBot 4be00c9b9e Automatic changelog generation for PR #5638 [ci skip] 2018-02-24 00:24:50 -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