shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,468 Commits 5 Branches 0 Tags
8a989d2afe06d0db2055ac9d4e4e79ff6761833c
Commit Graph

17468 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cameron!
8a989d2afe Quartermaster can no longer be a changeling or traitor (#7062) 
* Quartermasters can no longer be changelings

Consistency with heads of staff not being antagonists.

* oops forgot this

Thanks Glitchy
 2018-06-11 13:40:19 -07:00
deathride58
de3e4ecec7 Merge pull request #6968 from Citadel-Station-13/upstream-merge-38186 
[MIRROR] Fix First Death not being remembered if DB is not in use
 2018-06-11 02:02:21 +00:00
CitadelStationBot
6d9543511f [MIRROR] Fixes loading zlevels with static lighting. (#7051) 
* Fixes loading zlevels with static lighting. (#38365)

* Fixes loading zlevels with static lighting.

* Actually this whole part is unnecessary now because change turf handles the change properly now.

* Correct

* Fixes loading zlevels with static lighting.
 2018-06-10 12:32:58 -07:00
CitadelStationBot
cc4ffe31dd [MIRROR] Fixes note/message interface flooding the string tree. (#7048) 
* Merge pull request #38379 from MrStonedOne/fasternotes

Fixes note/message interface flooding the string tree.

* Fixes note/message interface flooding the string tree.
 2018-06-10 12:32:10 -07:00
CitadelStationBot
0c7114ff3a Automatic changelog generation for PR #7045 [ci skip] 2018-06-10 14:31:56 -05:00
Michiyamenotehifunana
a6966e2a97 Adds a (mostly) cosmetic flak jacket and helmet (#7045) 2018-06-10 12:31:54 -07:00
CitadelStationBot
2a727c6df2 [MIRROR] Removes unused overview code. (#7054) 
* Merge pull request #38361 from AnturK/yeahno

Removes unused overview code.

* Removes unused overview code.
 2018-06-10 12:31:19 -07:00
CitadelStationBot
1bf74841c7 [MIRROR] Removes reactive incendiary armor from non-admin methods of obtaining (#7050) 
* Make incendiary armor aspawn only (#38370)

* Removes reactive incendiary armor from non-admin methods of obtaining
 2018-06-10 12:30:57 -07:00
CitadelStationBot
8413eb2888 [MIRROR] Squashes traitors under one path (#7049) 
* Squashes traitors under one path (#38332)

* Squashes traitors under one path
 2018-06-10 12:30:00 -07:00
CitadelStationBot
6510066918 [MIRROR] Logs minor and major crimes (#7053) 
* Merge pull request #38358 from nfreader/record_crimes

Logs minor and major crimes

* Logs minor and major crimes
 2018-06-10 12:29:15 -07:00
LetterJay
108ff89719 Dark Carapace - Donator Item (#7055) 
* donator

* POWERGAME
 2018-06-10 12:28:58 -07:00
CitadelStationBot
e68fbe9fa4 [MIRROR] Readds actual fun to admins throwing around drop pods (#7052) 
* Readds actual fun to admins throwing around drop pods (#38374)

* Readds fun

* Fun

* Readds actual fun to admins throwing around drop pods
 2018-06-10 12:28:38 -07:00
deathride58
e4fcf46cfd Merge branch 'master' into upstream-merge-38186 2018-06-09 05:54:28 +00:00
deathride58
e279392386 Merge pull request #6962 from Citadel-Station-13/upstream-merge-38128 
[MIRROR] Standardizes and cleans up some admin messages & logging
 2018-06-09 05:53:25 +00:00
deathride58
4241ef321e Merge pull request #7027 from Citadel-Station-13/upstream-merge-38301 
[MIRROR] Fixes infrared emmiters partially.
 2018-06-09 05:25:54 +00:00
deathride58
38878094bc Merge pull request #6982 from Citadel-Station-13/upstream-merge-38264 
[MIRROR] Fix autoprocessing cloners
 2018-06-09 05:13:23 +00:00
deathride58
8dc3d5f70a Update suicide.dm 2018-06-09 00:47:48 -04:00
CitadelStationBot
5963d0224f Automatic changelog generation for PR #7022 [ci skip] 2018-06-08 23:45:10 -05:00
deathride58
9963d5a365 Merge pull request #7022 from Citadel-Station-13/upstream-merge-38294 
[MIRROR] Readds hunger slowdown
 2018-06-09 04:45:08 +00:00
CitadelStationBot
427211227b Automatic changelog generation for PR #7031 [ci skip] 2018-06-08 23:43:22 -05:00
deathride58
ec01a957f1 Merge pull request #7031 from Citadel-Station-13/upstream-merge-38308 
[MIRROR] Moved picture-in-picture objects down to the floor plane
 2018-06-09 04:43:20 +00:00
deathride58
e739540177 Merge pull request #7032 from Citadel-Station-13/upstream-merge-38288 
[MIRROR] Removes a defect concerning a simple tool in the admin toolset
 2018-06-09 04:42:53 +00:00
deathride58
aae9df5335 Merge pull request #7035 from Citadel-Station-13/upstream-merge-38333 
[MIRROR] Remove mobs from idle NPC pool on Destroy
 2018-06-09 04:41:22 +00:00
deathride58
0e3d5a7512 Update infrared.dm 2018-06-09 00:35:13 -04:00
deathride58
5858b790d7 Update cloning.dm 2018-06-09 00:34:01 -04:00
CitadelStationBot
09936bb59a Automatic changelog generation for PR #7030 [ci skip] 2018-06-08 23:32:20 -05:00
deathride58
697b1313b7 Merge pull request #7030 from Citadel-Station-13/upstream-merge-38309 
[MIRROR] Vehiclecode is now far more responsive when their movespeed delays are changed after they move.
 2018-06-09 04:32:18 +00:00
deathride58
1fdbd81023 Merge pull request #7037 from Citadel-Station-13/upstream-merge-38320 
[MIRROR] Fixes Lisa's description
 2018-06-09 04:31:20 +00:00
deathride58
3a36a24a8b Merge pull request #7038 from Citadel-Station-13/upstream-merge-38303 
[MIRROR] Adds swimsuits for the summer ball event
 2018-06-09 04:30:27 +00:00
CitadelStationBot
806751f4fb Automatic changelog generation for PR #7039 [ci skip] 2018-06-08 23:29:32 -05:00
deathride58
b2d70b2f67 Merge pull request #7039 from Citadel-Station-13/upstream-merge-38279 
[MIRROR] Fix pAI suicide while in holoform deleting the card
 2018-06-09 04:29:30 +00:00
CitadelStationBot
48e4f9f8eb Automatic changelog generation for PR #7040 [ci skip] 2018-06-08 23:29:01 -05:00
deathride58
0f388bc994 Merge pull request #7040 from Citadel-Station-13/upstream-merge-38266 
[MIRROR] Adds warning to shuttle purchase menu
 2018-06-09 04:28:59 +00:00
CitadelStationBot
cc915f0686 Automatic changelog generation for PR #7041 [ci skip] 2018-06-08 23:27:46 -05:00
deathride58
a016682716 Merge pull request #7041 from Citadel-Station-13/upstream-merge-38211 
[MIRROR] Fix meson goggles and lantern wisps conflicting
 2018-06-09 04:27:45 +00:00
CitadelStationBot
6994e60101 Automatic changelog generation for PR #7042 [ci skip] 2018-06-08 23:27:09 -05:00
deathride58
91599773e8 Merge pull request #7042 from Citadel-Station-13/upstream-merge-38350 
[MIRROR] Adds indestructible sandstone wall
 2018-06-09 04:27:07 +00:00
deathride58
ec361e26a5 Merge pull request #7036 from Cw3040/master 
Cw's dumb Map Edits v.4
 2018-06-08 18:24:13 +00:00
letterjay
da1abb7375 Adds indestructible sandstone wall 2018-06-07 23:16:17 -05:00
CitrusGender
9124dac65f Adds indestructible sandstone wall (#38350) 
* adds sandstone

* OKAY FINE KOR

JEEZ

* I am very angry right now

* you don't seem to understand

* Update closed.dm
 2018-06-07 23:16:17 -05:00
letterjay
74466f4f66 Fix meson goggles and lantern wisps conflicting 2018-06-07 20:33:50 -05:00
Tad Hardesty
f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05:00
letterjay
5939698cb1 Adds warning to shuttle purchase menu 2018-06-07 20:32:38 -05:00
81Denton
16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -05:00
Cw3040
d5e3001261 Changes 
This should fix Travis's issue.
 2018-06-07 21:14:21 -04:00
letterjay
4e36cde979 Fix pAI suicide while in holoform deleting the card 2018-06-07 20:06:54 -05:00
Tad Hardesty
38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 20:06:54 -05:00
letterjay
954f56912f Adds swimsuits for the summer ball event 2018-06-07 20:00:36 -05:00
Kraseo
cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
letterjay
2b3f80a6e7 Fixes Lisa's description 2018-06-07 19:54:18 -05:00