shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,258 Commits 5 Branches 0 Tags
b7015c379a79a3e771fca6406357897adc200b8e
Commit Graph
14258 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
PoojawaandGitHub 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
CitadelStationBotandPoojawa ece7f0e905 Adds two more drinks, Bastion Bourbon and Squirt Cider (#5681) 2018-02-24 06:11:45 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
LetterJayandGitHub 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
EtheoBoxxmanandPoojawa 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
CitadelStationBot 93ced0745b Automatic changelog generation for PR #5617 [ci skip] 2018-02-23 19:19:26 -06:00
deathride58andPoojawa 2e84b30841 Makes martial arts use Knockdown() instead of Stun() for their stuns (#5617) 2018-02-23 19:19:23 -06:00
CitadelStationBot 01246a62df Automatic changelog generation for PR #5616 [ci skip] 2018-02-23 19:18:54 -06:00
deathride58andPoojawa 759444c148 Removes xeno stun and stamina immunity (#5616) 2018-02-23 19:18:52 -06:00
CitadelStationBot 08c010f87a Automatic changelog generation for PR #5674 [ci skip] 2018-02-23 17:42:59 -06:00
CitadelStationBotandPoojawa 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 f3b42842ad Automatic changelog generation for PR #5673 [ci skip] 2018-02-23 17:42:26 -06:00
CitadelStationBotandPoojawa 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 3755037c28 Automatic changelog generation for PR #5672 [ci skip] 2018-02-23 17:42:06 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBot 3dcb3f0ae2 Automatic changelog generation for PR #5670 [ci skip] 2018-02-23 09:30:11 -06:00
deathride58andGitHub 8b25bfc337 Merge pull request #5670 from Poojawa/shock-collar-fix 
Adds Shock collars back to autolathes
 2018-02-23 15:30:08 +00:00
deathride58andGitHub 330c4f6855 Merge pull request #5671 from Citadel-Station-13/upstream-merge-35902 
[MIRROR] Fixes a dumbo runtime error in the analyzer's barometer function. OOF.
 2018-02-23 15:29:22 +00:00
CitadelStationBot 72eef90596 Fixes a dumbo runtime error in the analyzer's barometer function. OOF. 2018-02-23 09:07:53 -06:00
KomradeSpectreandCitadelStationBot 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
deathride58andGitHub 21179c9105 Merge pull request #5631 from Citadel-Station-13/upstream-merge-35733 
[MIRROR] [s] Cameranet fixes
 2018-02-23 13:21:23 +00:00
Poojawa 32f66fc5a3 Adds Shock collars back to autolathes 2018-02-23 06:52:41 -06:00
CitadelStationBot 15b3716f07 Automatic changelog generation for PR #5669 [ci skip] 2018-02-23 06:45:03 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBot 4f8bfea376 Automatic changelog generation for PR #5649 [ci skip] 2018-02-22 23:48:57 -06:00
Chayse RamsayandPoojawa 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
CitadelStationBot ee84c6496c Automatic changelog generation for PR #5668 [ci skip] 2018-02-22 23:48:26 -06:00
PoojawaandGitHub 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 dab8c061d9 Automatic changelog generation for PR #5666 [ci skip] 2018-02-22 23:43:25 -06:00
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa 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
CitadelStationBotandPoojawa b66e76d97b [MIRROR] Fixes firelock deconstruction (#5664) 
* Fixes firelock deconstruction (#35884)

* Fixes firelock deconstruction
 2018-02-22 23:42:26 -06:00
CitadelStationBot 61eb0fe59a Automatic changelog generation for PR #5663 [ci skip] 2018-02-22 23:42:00 -06:00
CitadelStationBotandPoojawa 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