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

14206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
ee84c6496c Automatic changelog generation for PR #5668 [ci skip] 2018-02-22 23:48:26 -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
dab8c061d9 Automatic changelog generation for PR #5666 [ci skip] 2018-02-22 23:43:25 -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
61eb0fe59a Automatic changelog generation for PR #5663 [ci skip] 2018-02-22 23:42:00 -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
2912be22a5 Automatic changelog generation for PR #5662 [ci skip] 2018-02-22 23:40:52 -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
1b943b15cf Automatic changelog generation for PR #5661 [ci skip] 2018-02-22 23:40:21 -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
9db42bab7f Automatic changelog generation for PR #5660 [ci skip] 2018-02-22 23:39:51 -06:00
CitadelStationBot
758d740112 [MIRROR] Cycle links space ruin airlocks (#5660) 
* Cycle links space ruin airlocks (#35870)

* cycle links space ruin airlocks

* loooooooooooooong ship

* Cycle links space ruin airlocks
 2018-02-22 23:39:49 -06:00
CitadelStationBot
078a5021b7 Automatic changelog generation for PR #5659 [ci skip] 2018-02-22 23:39:27 -06:00
CitadelStationBot
133bf4e224 [MIRROR] Cycle links pt.2: the linkening (#5659) 
* Cycle links pt.2: the linkening (#35871)

* cyclelink 2: the linkening

* removes whiteship_box cycle link

* Cycle links pt.2: the linkening
 2018-02-22 23:39:25 -06:00
CitadelStationBot
267fffe27b Automatic changelog generation for PR #5658 [ci skip] 2018-02-22 23:38:50 -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
CitadelStationBot
ce987fdd16 Automatic changelog generation for PR #5657 [ci skip] 2018-02-22 23:16:38 -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
LetterJay
8ff64f6874 Merge pull request #5656 from Citadel-Station-13/upstream-merge-35876 
[MIRROR] tabling people on brass tables makes a clanging sound
 2018-02-22 23:15:28 -06:00
CitadelStationBot
bde2e2c598 Toxin lovers properly take toxin damage from liver failure 2018-02-22 14:43:47 -06:00
cebutris
4d1f93660f Toxin lovers properly take toxin damage from liver failure (#35901) 
* Toxin lovers properly take toxin damage from liver failiure

* Makes it forced instead of checking for toxinlover
 2018-02-22 14:43:47 -06:00
CitadelStationBot
e66a9dbc50 tabling people on brass tables makes a clanging sound 2018-02-22 14:32:25 -06:00
Buggy123
eaab8a687c tabling people on brass tables makes a clanging sound (#35876) 
* tabling people on brass tables makes a sound

* fixes syntax

* more syntax fixes
 2018-02-22 14:32:25 -06:00
kevinz000
7e5057b99e fixes arousalloss not being a valid damage type for humans (#5654) 
* goddamnit you broke arousal

* Update species.dm
 2018-02-22 12:00:51 -06:00
CitadelStationBot
c6ad3899d4 Automatic changelog generation for PR #5633 [ci skip] 2018-02-22 01:37:34 -06:00
cebutris
07c7c5e6bf Slimes have no livers! (#5633) 2018-02-22 01:37:32 -06:00
CitadelStationBot
da690f3e07 [MIRROR] Adds five second cooldown to morgue tray beeps (#5652) 
* Adds five second cooldown to morgue tray beeps (#35818)

* Adds five second cooldown to morgue tray beeps
 2018-02-22 01:37:06 -06:00
CitadelStationBot
dc215016bc Automatic changelog generation for PR #5650 [ci skip] 2018-02-22 01:30:54 -06:00
CitadelStationBot
3b07fc6717 [MIRROR] Ninja event 'fun' change. (#5650) 
* Ninja event 'fun' change. (#35859)

* Lower 1 hour events to 40mins

* Revert change to Slaughter demon

Waaaaaaaaa

* Revert "Revert change to Slaughter demon"

This reverts commit 92e187338367952ea00ef05b9d2f17d8ff6fb12c.

* Truly revert Slaughter Demon change

Waaaaaa

* Ninja event 'fun' change.
 2018-02-22 01:30:52 -06:00
CitadelStationBot
8b2d16547b Automatic changelog generation for PR #5651 [ci skip] 2018-02-22 01:30:16 -06:00
CitadelStationBot
05fc69289a [MIRROR] Update Ninja welcome text (#5651) 
* Updates Ninja welcome text (#35863)

* Update Ninja welcome text
 2018-02-22 01:30:14 -06:00
CitadelStationBot
9b5b9937a8 Automatic changelog generation for PR #5653 [ci skip] 2018-02-22 01:29:29 -06:00
CitadelStationBot
af34232b1a [MIRROR] Adds techweb doppler arrays and fixes their name/desc (#5653) 
* adds techweb doppler arrays, fixes techweb desc/name (#35846)

* Adds techweb doppler arrays and fixes their name/desc
 2018-02-22 01:29:26 -06:00
CitadelStationBot
23b98e4e52 [MIRROR] Holopads have a special animation for an unanswered incoming call (#5644) 
* Holopads have a special animation for an unanswered incoming call (#35391)

* Holopads have a special animation for an unanswered incoming call

🆑 coiax
add: Holopads now flash a green line when there is an incoming call.
/🆑

* Holopads have a special animation for an unanswered incoming call
 2018-02-21 19:48:10 -06:00
CitadelStationBot
08ce2f5fad Automatic changelog generation for PR #5640 [ci skip] 2018-02-21 19:47:17 -06:00
CitadelStationBot
7586804fca [MIRROR] Remove poisoned apple (#5640) 
* Merge pull request #35820 from vuonojenmustaturska/vuonojenmustaturska-patch-2

Remove poisoned apple

* Remove poisoned apple
 2018-02-21 19:47:15 -06:00
CitadelStationBot
21a9d4bca4 [MIRROR] [READY]Astar improvement (#5646) 
* [READY]Astar improvement (#34713)

Improvements to A* via using bitflags to find directions and caching already checked directions so we don't recheck them.

* [READY]Astar improvement
 2018-02-21 19:46:54 -06:00
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