shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,506 Commits 5 Branches 0 Tags
ac078c4789f2b8f0c94c4d27c04c034a9138f39a
Commit Graph
6563 Commits
Author SHA1 Message Date
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
orangesandletterjay 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
orangesandletterjay 1d0f775f56 Merge pull request #38360 from ShizCalev/key-cleanup 
Cleans up some logging
 2018-06-11 22:29:27 -05:00
orangesandletterjay 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
deathride58andGitHub 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
deathride58andGitHub a4345c8fdb Update stabilized.dm 2018-06-11 23:13:46 -04:00
deathride58andGitHub a2f1e9f47f Update _status_effects.dm 2018-06-11 23:13:11 -04:00
AnturKandletterjay 6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
ShizCalevandletterjay 18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05:00
fludd12andletterjay c47c812fdf Fixes and Upgrades Stabilized Gold Extracts 2018-06-11 00:04:13 -05:00
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
CitadelStationBotandkevinz000 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 8dc3d5f70a Update suicide.dm 2018-06-09 00:47:48 -04:00
deathride58andGitHub 9963d5a365 Merge pull request #7022 from Citadel-Station-13/upstream-merge-38294 
[MIRROR] Readds hunger slowdown
 2018-06-09 04:45:08 +00:00
deathride58andGitHub 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
deathride58andGitHub 0e3d5a7512 Update infrared.dm 2018-06-09 00:35:13 -04:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
Tad Hardestyandletterjay f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05:00
Tad Hardestyandletterjay 38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 20:06:54 -05:00
Kraseoandletterjay cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
Iamgoofballandletterjay 7e89cb37a6 Fixes Lisa's description (#38320) 2018-06-07 19:54:18 -05:00
Tad Hardestyandletterjay 458fb9f83d Remove mobs from idle NPC pool on Destroy (#38333) 
* Remove mobs from idle NPC pool on Destroy

* Combine simple_animal Destroy procs
 2018-06-07 17:07:45 -05:00
deathride58andGitHub c93213ff25 Update species.dm 2018-06-07 00:35:26 -04:00
deathride58andGitHub 8d97bc79e5 Merge pull request #7024 from Citadel-Station-13/upstream-merge-38300 
[MIRROR] Fixes Pubby maint boozeomat
 2018-06-07 04:34:46 +00:00
deathride58andGitHub a4d1d3d89b Merge pull request #7025 from Citadel-Station-13/upstream-merge-37790 
[MIRROR] Individual Logs now follow the client around automatically
 2018-06-07 04:34:11 +00:00
81Dentonandletterjay afadb178d2 Adds missing races to mob spawn list (#38314) 
* adds moths to mob species list

* adds missing species
 2018-06-06 17:49:08 -05:00
AnturKandletterjay 2675481198 Fixes infrared emmiters partially. 2018-06-06 14:26:34 -05:00
orangesandletterjay de68aa9571 Individual Logs now follow the client around automatically (#37790) 
The logging is now stored in the persistent client/player_details datum,
that will survive an entire round

The existing mob log is retained and a new admin verb is added to access
it. It will only show logs for the mob in question, across all players
who possibly spent time in that mob

A new log type is added that tracks the mobs the player changes across
into and the times they occured, to better help admins manage complex
situations, this also appears in the mob log as a record of the players
who entered/exited control of the mob
 2018-06-06 04:10:20 -05:00
81Dentonandletterjay e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
CitadelStationBotandkevinz000 a298f20fa5 [MIRROR] [s] Fixes syndicate sentience exploit (#7021) 
* Fixes syndicate sentience exploit (#38299)

* [s] Fixes syndicate sentience exploit
 2018-06-05 23:14:48 -07:00
iksypandletterjay 0d6cec9d8c Readds hunger slowdown 2018-06-05 22:35:46 -05:00
deathride58andGitHub aab6a78305 Merge pull request #6960 from Citadel-Station-13/upstream-merge-38165 
[MIRROR] Adds config for monkey cap
 2018-06-05 23:38:54 +00:00
deathride58andGitHub 98fa9db020 Merge pull request #6971 from Citadel-Station-13/upstream-merge-38179 
[MIRROR] Fix Pubby auxiliary mining base
 2018-06-05 23:37:37 +00:00
deathride58andGitHub bdef4e4e77 Merge pull request #6979 from Citadel-Station-13/upstream-merge-38116 
[MIRROR] Refactor machinery to default to being anchored
 2018-06-05 23:37:20 +00:00
deathride58andGitHub cf170aee33 Merge pull request #7019 from Citadel-Station-13/upstream-merge-38193 
[MIRROR] Turns /datum.isprocessing into a datum flag
 2018-06-05 23:36:37 +00:00
MrDoomBringerandletterjay 71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
vuonojenmustaturskaandletterjay 83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58andGitHub b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
deathride58andGitHub 255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00