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

6554 Commits

Author SHA1 Message Date
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
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
AnturK
6d8e6e072e Fixes nuke exploding instantly. (#38417) 2018-06-11 09:16:47 -05:00
ShizCalev
18bc48c0df Makes swimsuits underwear (#38372) 2018-06-11 00:14:45 -05: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
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
8dc3d5f70a Update suicide.dm 2018-06-09 00:47:48 -04: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
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
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
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
Tad Hardesty
f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05:00
Tad Hardesty
38a3c8549f Fix pAI suicide while in holoform deleting the card (#38279) 2018-06-07 20:06:54 -05:00
Kraseo
cf8436cf6d a slippery slope into h*ck (#38303) 2018-06-07 20:00:36 -05:00
Iamgoofball
7e89cb37a6 Fixes Lisa's description (#38320) 2018-06-07 19:54:18 -05:00
Tad Hardesty
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
deathride58
c93213ff25 Update species.dm 2018-06-07 00:35:26 -04:00
deathride58
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
deathride58
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
81Denton
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
AnturK
2675481198 Fixes infrared emmiters partially. 2018-06-06 14:26:34 -05:00
oranges
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
81Denton
e3f9229e08 Fixes Pubby maint boozeomat (#38300) 2018-06-06 02:36:34 -05:00
CitadelStationBot
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
iksyp
0d6cec9d8c Readds hunger slowdown 2018-06-05 22:35:46 -05:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
MrDoomBringer
71f684e5d8 Admin Supplypod tweaks (Behaves like fireballs, also stuns targets) (#38290) 
* Arianya

* whups caps
 2018-06-05 18:02:36 -05:00
vuonojenmustaturska
83ac5852dd Turn /datum.isprocessing into a datum flag (#38193) 2018-06-05 18:00:21 -05:00
deathride58
b3b9a44689 Merge branch 'master' into upstream-merge-38165 2018-06-05 21:53:14 +00:00
deathride58
255ffb96bb Merge branch 'master' into upstream-merge-38179 2018-06-05 21:32:22 +00:00
deathride58
b49458e0ba Merge branch 'master' into upstream-merge-38116 2018-06-05 21:30:21 +00:00
deathride58
963ad5dce9 Merge pull request #6983 from Citadel-Station-13/upstream-merge-38238 
[MIRROR] Fixes pda style loading
 2018-06-05 21:23:53 +00:00
deathride58
79d304eeb7 Merge pull request #7015 from Citadel-Station-13/upstream-merge-38283 
[MIRROR] Stops swarmers from attacking field gens/turret covers
 2018-06-05 21:04:15 +00:00
deathride58
2b02092639 Update preferences.dm 2018-06-05 17:03:55 -04:00
CitadelStationBot
de73153ccb [MIRROR] Fixes uplink refunds (#7014) 
* Fixes uplink refunds (#38272)

* Fixes uplink refunds

* Whoops

* Sure

* Fixes uplink refunds
 2018-06-05 11:19:33 -07:00
CitadelStationBot
eb2368be03 [MIRROR] Fix inconsistent energy gun suicide (#7012) 
* Fix inconsistent energy gun suicide (#38252)

* Fix inconsistent energy gun suicide
 2018-06-05 11:18:27 -07:00
CitadelStationBot
74aeecca6d [MIRROR] Fix the Lightning Bolt spell (#7013) 
* Fix the Lightning Bolt spell (#38253)

* Fix the Lightning Bolt spell
 2018-06-05 11:17:47 -07:00
81Denton
a93d92569f Stop swarmers from attacking field gens/turret covers (#38283) 2018-06-05 13:17:12 -05:00
CitadelStationBot
0b362e017b [MIRROR] Lavaland Clock Cult Ruin (#7011) 
* Lavaland Clock Cult Ruin (#38263)

* Dead Ratvar

* tgm map

* Lavaland Clock Cult Ruin
 2018-06-05 11:16:55 -07:00