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

10988 Commits

Author SHA1 Message Date
CitadelStationBot
d06df512d0 [MIRROR] [s] Fixes exploit where botany trays can be refilled at no cost. (#7081) 
* [s] Fixes exploit where botany trays can be refilled at no cost.

* Merge pull request #38422 from DaxDupont/hydroponics

[s] Fixes exploit where botany trays can be refilled at no cost.
 2018-06-13 20:25:08 -07:00
CitadelStationBot
0ab6db65a7 [MIRROR] BoH bombs now forcefully stun anyone flying when they go off (#7100) 
* BoH bombs now forcefully stun anyone flying when they go off (#38397)

* Update bag_of_holding.dm

* Incorrect type.

* BoH bombs now forcefully stun anyone flying when they go off
 2018-06-13 19:44:43 -07:00
CitadelStationBot
d875c362fa [MIRROR] Turf grammar omnibus (#7104) 
* Turf grammar omnibus (#38375)

* Fix plurality and propriety on turfs

Some turfs are marked tentatively plural in order to avoid an incorrect
choice of "a" or "an".

* Add an article var to handle unusual a/an

* An additional pass on turf names

* Decapitalize server, mainframe, killroom floors

* Turf grammar omnibus
 2018-06-13 19:31:29 -07:00
CitadelStationBot
226780e0ed [MIRROR] Fixes vote ss trying to remove actions of people who already voted. (#7099) 
* Fixes votes trying to remove actions of people who already voted. (#38431)

* Fixes vote ss trying to remove actions of people who already voted.
 2018-06-13 19:30:14 -07:00
CitadelStationBot
8ec3ac03cd [MIRROR] Fixes drunken scientist R&D point gain. (#7098) 
* Fixes drunken scientist R&D point gain. (#38432)

* Fixes drunken scientist point gain.

* Only R&D points

* Didn't mean to add this newline here.

* Fixes drunken scientist R&D point gain.
 2018-06-13 19:28:35 -07:00
CitadelStationBot
496a1d1165 [MIRROR] [s] Fixes sleeper logging. (#7085) 
* Merge pull request #38429 from AnturK/runtimeA

[s] Fixes sleeper logging.

* [s] Fixes sleeper logging.
 2018-06-12 17:23:37 -07:00
LetterJay
64d5c8cbdc Merge pull request #7073 from Citadel-Station-13/upstream-merge-38381 
[MIRROR] Fix legion cores not healing confusion
 2018-06-12 08:09:20 -05:00
LetterJay
8b65c88f64 Merge pull request #7077 from Citadel-Station-13/upstream-merge-38404 
[MIRROR] Fixes unintentional vehicle buff
 2018-06-12 08:08:51 -05:00
LetterJay
d4684b5204 Merge pull request #7074 from Citadel-Station-13/upstream-merge-38424 
[MIRROR] Removes doubled iaa definition.
 2018-06-12 08:08:39 -05:00
LetterJay
14f7ca0449 Merge pull request #7072 from Citadel-Station-13/upstream-merge-38376 
[MIRROR] [s] Fix lockboxes not actually being locked
 2018-06-12 08:08:15 -05:00
LetterJay
2c0a82ec50 Merge pull request #7070 from Citadel-Station-13/upstream-merge-38378 
[MIRROR] Fix deaf people hearing borg modules going offline
 2018-06-12 08:03:40 -05:00
LetterJay
49cdba9f90 Merge pull request #7069 from Citadel-Station-13/upstream-merge-38380 
[MIRROR] Give plasmamen their plasma suits in VR
 2018-06-12 07:59:20 -05:00
LetterJay
ac078c4789 Merge pull request #7068 from Citadel-Station-13/upstream-merge-38382 
[MIRROR] Make chat squashing HTML-agnostic II
 2018-06-12 07:58:55 -05:00
LetterJay
87cc0e6c6f Merge pull request #7067 from Citadel-Station-13/upstream-merge-38360 
[MIRROR] Cleans up some logging
 2018-06-12 07:41:10 -05:00
LetterJay
e20db49269 Merge pull request #7066 from Citadel-Station-13/upstream-merge-38366 
[MIRROR] Replace area-wide fire overlay with reddening the lights
 2018-06-12 07:38:13 -05:00
LetterJay
69bfb75970 Merge pull request #7065 from Citadel-Station-13/upstream-merge-38367 
[MIRROR] Fix pulling diagonally looking goofy
 2018-06-12 07:37:00 -05:00
LetterJay
b9365f45e1 Merge pull request #7056 from Citadel-Station-13/upstream-merge-38394 
[MIRROR] Fixes and Upgrades Stabilized Gold Extracts
 2018-06-12 07:35:47 -05:00
kevinz000
4d9645766a Fixes unintentional vehicle buff (#38404) 2018-06-12 00:57:53 -05:00
Jordan Brown
adf4cad9ea Merge pull request #38424 from AnturK/iaafixup 
Removes doubled iaa definition.
 2018-06-11 22:30:26 -05:00
Jordan Brown
9835bed8d4 Merge pull request #38381 from AutomaticFrenzy/patch/orb-of-confusion 
Fix legion cores not healing confusion
 2018-06-11 22:30:18 -05:00
oranges
4f379bb0d0 Merge pull request #38376 from AutomaticFrenzy/patch/lockbox 
[s] Fix lockboxes not actually being locked
 2018-06-11 22:30:08 -05:00
oranges
69730f0a60 Merge pull request #38378 from AutomaticFrenzy/patch/deaf-borg-mods 
Fix deaf people hearing borg modules going offline
 2018-06-11 22:29:51 -05:00
oranges
997d85329c Merge pull request #38380 from AutomaticFrenzy/patch/vr-plasmemes 
Give plasmamen their plasma suits in VR
 2018-06-11 22:29:43 -05:00
oranges
bc35ff9b10 Merge pull request #38382 from AutomaticFrenzy/patch/squash-no-markup 
Make chat squashing HTML-agnostic II
 2018-06-11 22:29:36 -05:00
oranges
1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
oranges
ffd705c8d7 Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay 
Replace area-wide fire overlay with reddening the lights
 2018-06-11 22:29:10 -05:00
oranges
3aaad1bc31 Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally 
Fix pulling diagonally looking goofy
 2018-06-11 22:29:01 -05:00
deathride58
e30807616a Merge pull request #7058 from Citadel-Station-13/upstream-merge-38372 
[MIRROR] Makes swimsuits an underwear option
 2018-06-12 03:15:58 +00:00
deathride58
abc19ae405 Merge pull request #7059 from Citadel-Station-13/upstream-merge-38388 
[MIRROR] Anti-magic components start active
 2018-06-12 03:15:28 +00:00
deathride58
7effee3ee8 Merge pull request #7061 from Citadel-Station-13/upstream-merge-38417 
[MIRROR] Fixes nuke exploding instantly.
 2018-06-12 03:14:37 +00:00
deathride58
67a5eee94b Merge pull request #7057 from Citadel-Station-13/upstream-merge-38396 
[MIRROR] Adds logging for sleeper chem injections
 2018-06-12 03:14:14 +00:00
deathride58
a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58
a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
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
AnturK
6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
XDTM
c67fe4a76f Anti-magic component start enabled (#38388) 2018-06-11 00:16:00 -05:00
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
ShizCalev
849c33f9bf Adds logging for sleeper chem injections (#38396) 2018-06-11 00:04:21 -05:00
fludd12
c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05: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
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
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