shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
14,166 Commits 5 Branches 0 Tags
e5aa6ea1cd223c08935cdcdab4e2d8a4e5127ffa
Commit Graph

14166 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
e5aa6ea1cd Automatic changelog generation for PR #5645 [ci skip] 2018-02-21 19:45:50 -06:00
CitadelStationBot
fc2605aaeb [MIRROR] Marauder limit fixed (#5645) 
* Merge pull request #35593 from Robustin/marauderfix2

Marauder limit fixed

* Marauder limit fixed
 2018-02-21 19:45:48 -06:00
CitadelStationBot
bd7acbb810 Automatic changelog generation for PR #5641 [ci skip] 2018-02-21 19:45:25 -06:00
CitadelStationBot
359a500e79 [MIRROR] New Donkpocket Box (#5641) 
* New Donkpocket Box (#35835)

cl Jittai / ChuckTheSheep
imageadd: NT has stopped buying re-boxed storebrand Donkpockets and now stocks stations with real, genuine, tasty Donkpockets!
/cl

RIP: #35601
I was asked to throw together some icons for donk baggies, but had some fun making the box.

* New Donkpocket Box
 2018-02-21 19:45:23 -06:00
CitadelStationBot
ee2951a478 Automatic changelog generation for PR #5642 [ci skip] 2018-02-21 19:45:01 -06:00
CitadelStationBot
c10a4184ce [MIRROR] Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<< (#5642) 
* Makes the morgue beep disable step clearer

cl
tweak: Nanotrasen has begun a campaign to inform their employees that you can alt-click to disable morgue tray beeping.
/cl

If its annoying you literally just alt-click to disable it. There's basically no situation where you would be able to hear it without being able to turn it off, except maybe the one morgue tray in the brig if you don't have access to the windoor (but just fucking ask sec to disable it).

* Makes it more apparent that >>>>>>>YOU CAN ALT CLICK TO DISABLE MORGUE TRAY BEEPING<<<<<<
 2018-02-21 19:44:58 -06:00
CitadelStationBot
f1b88666ef [MIRROR] Rebalances Hearty Punch (#5643) 
* Rebalances Hearty Punch (#35836)

Changed healing rates to be more in par with Atropine but not as weak.
Increased metabolization rate.

balance: Rebalanced healing properties. Metabolization rate upped.

It still allows you to keep on fighting during duress and its combat properties have remained untouched. Also, I think it's an oversight that something with this much alcohol could heal what would be proper ethanol damage suffered from consuming what is a high amount of BAC you'll get from drinking a cocktail like this

* Rebalances Hearty Punch
 2018-02-21 19:44:37 -06:00
CitadelStationBot
13d6f59efc Automatic changelog generation for PR #5647 [ci skip] 2018-02-21 19:44:22 -06:00
CitadelStationBot
03dfbe7137 [MIRROR] Ports Barometers from Yogstation (#5647) 
* Ports Barometers from Yogstation (#35730)

* Ports Barometers from Yogstation

* Ports Barometers from Yogstation

* Added missing barometer_predictable bools

* Gives the atmos analyzer love instead of a new item.

* Moves playsound under cooldown to prevent soundspam.

* Ports Barometers from Yogstation
 2018-02-21 19:44:20 -06:00
CitadelStationBot
87053ef22b Automatic changelog generation for PR #5648 [ci skip] 2018-02-21 19:43:59 -06:00
CitadelStationBot
530f060c77 [MIRROR] Fixes windoors dropping extra cable (#5648) 
* Merge pull request #35857 from Repukan/TWOCABLES

Fixes windoors dropping extra cable

* Fixes windoors dropping extra cable
 2018-02-21 19:43:56 -06:00
deathride58
4f31e42574 Merge pull request #5637 from Citadel-Station-13/upstream-merge-35845 
[MIRROR] Fixes patches runtime when applying to missing limbs.
 2018-02-21 18:16:13 +00:00
CitadelStationBot
ed4bcfb088 Automatic changelog generation for PR #5636 [ci skip] 2018-02-21 12:16:00 -06:00
deathride58
a097ece7e0 Merge pull request #5636 from Citadel-Station-13/upstream-merge-35842 
[MIRROR] Tweaks meteor shield emag text
 2018-02-21 18:15:58 +00:00
CitadelStationBot
2336bd388a Automatic changelog generation for PR #5635 [ci skip] 2018-02-21 12:15:44 -06:00
deathride58
10b194343d Merge pull request #5635 from Citadel-Station-13/upstream-merge-35841 
[MIRROR] Changes event earliest_start to use time helpers
 2018-02-21 18:15:42 +00:00
CitadelStationBot
aca8b3a47a Fixes patches runtime when applying to missing limbs. 2018-02-21 11:41:51 -06:00
AnturK
73928eb9c0 Fixes patches runtime when applying to missing limbs. (#35845) 
* Fixes patches runtime when applying to missing limbs.

* Some feedback.
 2018-02-21 11:41:51 -06:00
CitadelStationBot
9d680f722f Tweaks meteor shield emag text 2018-02-21 11:40:39 -06:00
Jordan Brown
3c25171b8d Merge pull request #35842 from 81Denton/meteor-emag-text 
Tweaks meteor shield emag text
 2018-02-21 11:40:39 -06:00
CitadelStationBot
2ecf99ebc7 Changes event earliest_start to use time helpers 2018-02-21 11:38:26 -06:00
81Denton
cfd768e09f Changes event earliest_start to use time helpers (#35841) 
* uses time helpers, tweaks santa/shuttle loan times

* hourS
 2018-02-21 11:38:26 -06:00
CitadelStationBot
c1d66af3a1 Automatic changelog generation for PR #5615 [ci skip] 2018-02-21 09:32:34 -06:00
CitadelStationBot
845f21047d [MIRROR] You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names (#5615) 
* You can now choose from ten random names in plastic surgery, and abductors can give their victims creepy subject names

* Update plastic_surgery.dm
 2018-02-21 09:32:31 -06:00
CitadelStationBot
a57cbab5ce Automatic changelog generation for PR #5618 [ci skip] 2018-02-21 09:32:12 -06:00
Chayse Ramsay
863dad8906 Changes the HoP to require Service experience (#5618) 2018-02-21 09:32:10 -06:00
CitadelStationBot
efbe9b366f Automatic changelog generation for PR #5630 [ci skip] 2018-02-21 09:28:56 -06:00
CitadelStationBot
af2ae3d727 [MIRROR] Reverts intercept_user_move change for flightsuits (#5630) 
* Merge pull request #35830 from vuonojenmustaturska/clientsignal

Reverts intercept_user_move change for flightsuits

* Reverts intercept_user_move change for flightsuits
 2018-02-21 09:28:53 -06:00
CitadelStationBot
fe8b463203 [MIRROR] Fixes the sensor corpse runtimes. (#5627) 
* Merge pull request #35837 from AnturK/sensorbadcode

Fixes the sensor corpse runtimes.

* Fixes the sensor corpse runtimes.
 2018-02-21 09:28:34 -06:00
CitadelStationBot
399b1c44fb [MIRROR] Revert the notify command not being admin only (#5629) 
* Merge pull request #35825 from tgstation/Cyberboss-patch-1

Revert the notify command not being admin only

* Revert the notify command not being admin only
 2018-02-21 09:28:12 -06:00
CitadelStationBot
83d1ad9e45 [MIRROR] Fixes jugg spell object damage (#5626) 
* Merge pull request #35839 from AnturK/take-code-damage

Fixes jugg spell object damage

* Fixes jugg spell object damage
 2018-02-21 09:27:50 -06:00
CitadelStationBot
54889864ab [MIRROR] Hopefully fixes gas miners (#5628) 
* Merge pull request #35828 from tgstation/Cyberboss-patch-2

Hopefully fixes gas miners

* Hopefully fixes gas miners
 2018-02-21 09:27:30 -06:00
CitadelStationBot
1724781d73 Automatic changelog generation for PR #5623 [ci skip] 2018-02-21 00:42:14 -06:00
Poojawa
8305efd5a1 Vore preference fix + Sounds respect wall barriers (#5623) 
* various vore QoLs

* removed unused button, added the verb
 2018-02-21 00:42:11 -06:00
deathride58
a89323182f Merge pull request #5622 from Citadel-Station-13/upstream-merge-35832 
[MIRROR] Removes duplicate first death log
 2018-02-21 06:31:33 +00:00
deathride58
172459b2d8 Merge pull request #5620 from Citadel-Station-13/upstream-merge-35823 
[MIRROR] Fixes clowntears not grinding properly #35814
 2018-02-21 06:31:11 +00:00
CitadelStationBot
f09aa4b862 Automatic changelog generation for PR #5619 [ci skip] 2018-02-21 00:30:34 -06:00
deathride58
1a76be5baa Merge pull request #5619 from Citadel-Station-13/upstream-merge-35759 
[MIRROR] Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers
 2018-02-21 06:30:31 +00:00
CitadelStationBot
a2bc2f7c73 Removes duplicate first death log 2018-02-20 18:58:49 -06:00
Jordie
b031f73ef4 Removes duplicate first death log (#35832) 
* Update blackbox.dm

* Update death.dm

* Update ticker.dm
 2018-02-20 18:58:48 -06:00
CitadelStationBot
85c0c288fb Fixes clowntears not grinding properly #35814 2018-02-20 17:28:12 -06:00
Ordonis
3a1cfe9f59 Fixes #35814 (#35823) 
Ree container changes ruined my neat solution now it's less neat
reeeeeeeeeeee
 2018-02-20 17:28:12 -06:00
CitadelStationBot
355fe7a0f9 Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers 2018-02-20 17:10:40 -06:00
Ashe Higgs
08bc84d3db Adds the dish drive, obtainable through techwebs and with circuit boards in the chef and bartender's lockers (#35759) 
* Adds the dish drive

* a e s t h e t i c

* Puts a dish drive circuit in the chef locker

* wardrobes, better control

* shiz!

* shiz! (x2)
 2018-02-20 17:10:40 -06:00
deathride58
2ac71b3647 Merge pull request #5614 from Citadel-Station-13/upstream-merge-35838 
[MIRROR] Fixes transit runtime.
 2018-02-20 15:27:01 +00:00
CitadelStationBot
64d0e4df4a Automatic changelog generation for PR #5613 [ci skip] 2018-02-20 09:26:52 -06:00
deathride58
93a90664b7 Merge pull request #5613 from Citadel-Station-13/upstream-merge-35792 
[MIRROR] Fixes multiserver mining formula
 2018-02-20 15:26:49 +00:00
CitadelStationBot
0fbd2f62f6 Automatic changelog generation for PR #5612 [ci skip] 2018-02-20 09:26:17 -06:00
deathride58
d2e49dd52e Merge pull request #5612 from Citadel-Station-13/upstream-merge-35802 
[MIRROR] Fixes ore stack sprites
 2018-02-20 15:26:11 +00:00
CitadelStationBot
0c60268f38 Automatic changelog generation for PR #5611 [ci skip] 2018-02-20 09:26:02 -06:00