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

10932 Commits

Author SHA1 Message Date
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 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 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 5858b790d7 Update cloning.dm 2018-06-09 00:34:01 -04: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
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
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
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
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
Tad Hardesty f962a02ef7 Fix meson goggles and lantern wisps conflicting (#38211) 2018-06-07 20:33:50 -05:00
81Denton 16c05b0d92 adds warning to shuttle purchase menu (#38266) 2018-06-07 20:32:38 -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
Jordan Brown 674621a4ac Merge pull request #38288 from Jalleo/Removes_Admin_detect 
Removes a defect concerning a simple tool in the admin toolset
 2018-06-07 08:52:30 -05:00
Jordan Brown 16d5991dd6 Merge pull request #38308 from Cruix/multicamera_floor_plane 
Moved picture-in-picture objects down to the floor plane
 2018-06-07 08:42:04 -05:00
Jordan Brown 7c5217746f Merge pull request #38309 from kevinz000/patch-517 
Vehiclecode is now far more responsive when their movespeed delays are changed after they move.
 2018-06-07 08:40:39 -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
deathride58 cb63c82805 Merge pull request #7026 from Citadel-Station-13/upstream-merge-38209 
[MIRROR] Fixes some holocall stuff
 2018-06-07 04:33:40 +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 717e635d28 Fixes some holocall stuff (#38209) 
* Fixes some holocall stuff

* Yep
 2018-06-06 14:25:23 -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
LetterJay fb4c1e8e28 Increases head jobs restricted from antag RNG (#6868) 
* restricts traitor and ling jobs

* Update changeling.dm

* Update traitor.dm
 2018-06-05 23:12:55 -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 cff10c62d0 Update cloning.dm 2018-06-05 17:24:15 -04: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
deathride58 d92f976917 Merge pull request #7016 from Citadel-Station-13/upstream-merge-38268 
[MIRROR] [Ready] Arcade reward: snack rigs
 2018-06-05 20:52:03 +00:00
81Denton 9fd7bfb347 Blacklist ion trails from chasms (#38284) 2018-06-05 13:29:53 -05:00
81Denton 2fb5bb10b5 Arcade reward: snack rigs (#38268) 
* chew you havisfaction a singlelicious satisfact to snack that up?

* random snack spawn and sponsor name

* static list/initialize
 2018-06-05 13:27:39 -05: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