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

14512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot
fe37e351bc [MIRROR] Updates RuntimeStation to make testing faster (#5807) 
* Merge pull request #36120 from XDTM/RuntimeFuntime

Updates RuntimeStation to make testing faster

* Updates RuntimeStation to make testing faster
 2018-03-05 13:00:50 -06:00
CitadelStationBot
6deeaab1f9 Automatic changelog generation for PR #5792 [ci skip] 2018-03-05 12:37:43 -06:00
CitadelStationBot
de97c9653a [MIRROR] SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD (#5792) 
* SOMETHING'S WRONG, I HOLD MY HEAD, BILLY HERRINGTON IS FUCKING DEAD

* Update fitness.dm

* fixes compile issue
 2018-03-05 12:37:40 -06:00
CitadelStationBot
5374393635 [MIRROR] Removes the devils var (#5819) 
* Merge pull request #36175 from tgstation/Cyberboss-patch-1

Removes the devils var

* Removes the devils var
 2018-03-05 12:34:28 -06:00
CitadelStationBot
6134f79a26 [MIRROR] Converts several species traits into generic traits (#5710) 
* Converts several species traits into generic traits

* Update traits.dm

* Update mousetrap.dm

* Update corporate.dm

* Update jellypeople.dm

* snowflake fix
 2018-03-05 12:34:01 -06:00
CitadelStationBot
536537a0a4 Automatic changelog generation for PR #5738 [ci skip] 2018-03-05 12:33:26 -06:00
Cameron!
841a4199af Removes MediHound's Noncon Vore (#5738) 
* Removes MediHound's Noncon Vore

MediHound once again respects vore preferences, as intended.

To make up for this, they now receive a unique cyborg hypospray with fewer reagents, increased energy costs, and no ability to upgrade.

* Moves Preference Check to New Sleeper-Specific Variable, Buffs Hypo

Rather than using target.devourable, MediHounds now check for a new target.sleeperable preference, which defaults to TRUE.

Also, removed the custom HoundHypo. MediHounds will now get the full borg hypospray.

* Removes unnecessary 5th port code

* Breaks the patch for Bhijn's viewing pleasure

DNM etc

* Still not fixed

* Fixes it again.

MediHound sleeper preference is now a game preference toggle, rather than a vore panel toggle.

MediHounds will not be able to ingest SSD or catatonic players.
 2018-03-05 12:33:23 -06:00
CitadelStationBot
1a3f6a7e9b Automatic changelog generation for PR #5811 [ci skip] 2018-03-05 12:30:32 -06:00
CitadelStationBot
fef85c1eb3 [MIRROR] Fix nightshift skipping certain maint APCs (#5811) 
* Merge pull request #36082 from AutomaticFrenzy/patch/nightshift-fix

Fix nightshift skipping certain maint APCs

* Fix nightshift skipping certain maint APCs
 2018-03-05 12:30:29 -06:00
CitadelStationBot
1a4d8b94a1 [MIRROR] Halves server file access cooldowns (#5812) 
* Halves server file access cooldowns (#36139)

* Lets me actually browse logs properly

* admins get to spam harder

* Halves server file access cooldowns
 2018-03-05 12:29:50 -06:00
deathride58
4b59a31a58 Merge pull request #5805 from Citadel-Station-13/upstream-merge-35894 
[MIRROR] Refactors construction datums into components
 2018-03-05 03:18:21 +00:00
deathride58
318481e62d Merge pull request #5804 from Citadel-Station-13/upstream-merge-36095 
[MIRROR] Makes blood rage more clear
 2018-03-05 03:17:54 +00:00
CitadelStationBot
1d661181a9 Automatic changelog generation for PR #5802 [ci skip] 2018-03-04 21:17:17 -06:00
deathride58
164185d84f Merge pull request #5802 from Citadel-Station-13/upstream-merge-36125 
[MIRROR] Makes Delta chem fridge more accessible
 2018-03-05 03:17:15 +00:00
CitadelStationBot
38e87270da Automatic changelog generation for PR #5801 [ci skip] 2018-03-04 21:16:51 -06:00
deathride58
d720adf672 Merge pull request #5801 from Citadel-Station-13/upstream-merge-35895 
[MIRROR] Fixes Guardian Spirits not being able to move in stopped time along with their user.
 2018-03-05 03:16:48 +00:00
CitadelStationBot
4476d559bd Automatic changelog generation for PR #5799 [ci skip] 2018-03-04 20:46:27 -06:00
deathride58
8c7d0b2d5d Merge pull request #5799 from Citadel-Station-13/upstream-merge-36019 
[MIRROR] Fixes tinfoil hats and lengthens the time for someone else to put it on
 2018-03-05 02:46:25 +00:00
CitadelStationBot
aeb89e43f0 Automatic changelog generation for PR #5798 [ci skip] 2018-03-04 20:46:02 -06:00
deathride58
fe25e77586 Merge pull request #5798 from Citadel-Station-13/upstream-merge-36116 
[MIRROR] Implants that grant spells to their owners, for adminbus
 2018-03-05 02:45:59 +00:00
CitadelStationBot
3a8e526609 Automatic changelog generation for PR #5797 [ci skip] 2018-03-04 20:45:36 -06:00
deathride58
fc4612fe93 Merge pull request #5797 from Citadel-Station-13/upstream-merge-36071 
[MIRROR] Advanced roasting sticks, for cooking sausages
 2018-03-05 02:45:33 +00:00
deathride58
5f742c446e Merge pull request #5796 from Citadel-Station-13/upstream-merge-36108 
[MIRROR] better addresses the gas miner active turf issue
 2018-03-05 02:44:49 +00:00
CitadelStationBot
e41bf8a21e Automatic changelog generation for PR #5794 [ci skip] 2018-03-04 20:44:12 -06:00
deathride58
aac73b7880 Merge pull request #5794 from Citadel-Station-13/upstream-merge-36001 
[MIRROR] Removes 'release all' buttons from ORM
 2018-03-05 02:44:10 +00:00
deathride58
effbae0876 Merge pull request #5793 from Citadel-Station-13/upstream-merge-36110 
[MIRROR] Prevents history from repeating itself
 2018-03-05 02:43:47 +00:00
deathride58
a853b6fc7d Merge pull request #5791 from Citadel-Station-13/upstream-merge-36057 
[MIRROR] Fixes transforming weapons runtiming due to no butchering component
 2018-03-05 02:43:07 +00:00
deathride58
bed120d202 Merge pull request #5790 from Citadel-Station-13/upstream-merge-36111 
[MIRROR] MC panel now shows world.time
 2018-03-05 02:42:49 +00:00
Poojawa
2117e8ecb0 recompiles tgui 2018-03-04 20:16:10 -06:00
CitadelStationBot
e6f9c2ca49 Refactors construction datums into components 2018-03-04 17:52:15 -06:00
ACCount
07e3c61067 Refactors construction datums into components (#35894) 2018-03-04 17:52:14 -06:00
CitadelStationBot
ba9308c374 Makes blood rage more clear 2018-03-04 17:33:44 -06:00
Buggy123
3350d145f8 Makes blood rage more clear (#36095) 
* Makes blood rage more clear

* Makes blood contract more clear

* Fixes minor span class error.
 2018-03-04 17:33:44 -06:00
CitadelStationBot
44d69dcf47 Makes Delta chem fridge more accessible 2018-03-04 17:25:12 -06:00
81Denton
4a15c347e7 Makes Delta chem fridge more accessible (#36125) 
* 20 hours in dream maker

* REMOVE WINDOOR FROM THE PREMISES
 2018-03-04 17:25:12 -06:00
CitadelStationBot
abf05a5f81 Fixes Guardian Spirits not being able to move in stopped time along with their user. 2018-03-04 17:11:47 -06:00
Potato-Masher
923934d623 Fixes Guardian Spirits not being able to move in stopped time along with their user. (#35895) 
* I have no idea if this will work, but hopefully makes stands immune to timestops if their master is.

* That looks better

* Maybe that will work, maybe it will not.

* Checks if the summoner actually exists.

As per review advice from @DaedalusGame.
 2018-03-04 17:11:47 -06:00
CitadelStationBot
df8711d0b7 Fixes tinfoil hats and lengthens the time for someone else to put it on 2018-03-04 16:06:14 -06:00
Dax Dupont
df5cbc448e Fixes tinfoil hats and lengthens the time for someone else to put it on (#36019) 
* Fixes tinfoil hats and lenghtens the time for someone else to put it on

* Adds some flavor to that text
 2018-03-04 16:06:14 -06:00
CitadelStationBot
b42b4f52b4 Implants that grant spells to their owners, for adminbus 2018-03-04 15:43:38 -06:00
vuonojenmustaturska
f3ad4b932d Implants that grant spells to their owners, for adminbus (#36116) 
* badmin implants

* honk
 2018-03-04 15:43:37 -06:00
CitadelStationBot
0bb93619b9 Advanced roasting sticks, for cooking sausages 2018-03-04 15:41:23 -06:00
vuonojenmustaturska
e849ab23aa Advanced roasting sticks, for cooking sausages (#36071) 
* stick

* a commit

* almost forgot something

* seems to compile
 2018-03-04 15:41:23 -06:00
CitadelStationBot
c226ac4e98 better addresses the gas miner active turf issue 2018-03-04 15:39:08 -06:00
Jordan Brown
caa59d936f Merge pull request #36108 from tgstation/duncathan-patch-1 
better addresses the gas miner active turf issue
 2018-03-04 15:39:08 -06:00
RandomMarine
db98a60274 Removes 'release all' buttons from ORM 2018-03-04 15:26:26 -06:00
CitadelStationBot
dffe1120c7 Prevents history from repeating itself 2018-03-04 15:00:48 -06:00
Jordan Brown
c87455f5a3 Prevents history from repeating itself (#36110) 
* Prevents history from repeating itself

* It persisteh
 2018-03-04 15:00:48 -06:00
CitadelStationBot
b7d33cbfaf Fixes transforming weapons runtiming due to no butchering component 2018-03-04 14:58:22 -06:00
kevinz000
e186825f20 Fixes transforming weapons runtiming due to no butchering component (#36057) 
* Transformation weapon fix

* Infact lets fix this too
 2018-03-04 14:58:22 -06:00