shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,199 Commits 5 Branches 0 Tags
524ecae0f07845dced7bdcc7995a9385bd3daa68
Commit Graph
2266 Commits
Author SHA1 Message Date
GhomandGitHub 608bb0a04c Merge pull request #10649 from kevinz000/hijack 
Completely reworks the hijack objective, and shuttle hijacking in general
 2020-02-20 14:40:08 +01:00
kevinz000andGitHub ca777c6c8b Merge pull request #11153 from Ghommie/Ghommie-cit587 
Fixing addiction moodlets not going away and secret sauce recipe paper.
 2020-02-20 06:17:33 -07:00
Artur 35aecac620 Disgust mood for bloodsuckers being disgusted, and blood bag inneficency 2020-02-20 12:50:25 +02:00
GhomandGitHub d680ab9fd5 Merge pull request #11025 from Arturlang/TGUI_Next_Nanites 
Ports TGUI Next and a lot of misc updates for nanites.
 2020-02-20 11:27:48 +01:00
Persi c4b4a90bd8 Oh hey it's KiloStation 
Trying to make Kilo open...

Finally, the work begins!

Kilo added!

Kilo Station!
 2020-02-20 00:58:54 -05:00
kevinz000andGitHub 2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000andGitHub 6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
kevinz000andGitHub a10c71320d Merge pull request #11117 from Citadel-Station-13/Ghommie-patch-1 
Makes the mob holder examine less dumb, also indentation.
 2020-02-19 19:02:34 -07:00
ArturlangandGitHub 796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Unknown c920d198e2 Update Viro to /tg/ standards 2020-02-19 12:17:57 -05:00
GhomandGitHub eb342d1591 Update mood.dm 2020-02-19 17:14:30 +01:00
Ghommie ee1f61b5de F 2020-02-19 14:26:11 +01:00
Ghommie 057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Winter Flare 00d66c9b91 Renamed CAT_FISH to CAT_EASTERN 2020-02-18 22:19:58 -05:00
kevinz000 d7949e810e Merge remote-tracking branch 'citadel/master' into staves 2020-02-18 02:20:58 -07:00
BlackMajor 9a54b451eb Added two more ruins, Owai's suggestions. 2020-02-18 12:57:48 +13:00
raspyosu 6e32a466af tweak mesmerize 
range increased
added a "windup"
hardstun length increased to counteract windup
windup allows target to attempt to avoid via breaking line of sight at the time the windup completes
initial stun reduced to major slowdown, user also recieves slowdown to prevent sprint memes from just letting them follow around a corner if there is one
 2020-02-17 17:24:09 -05:00
GhomandGitHub b028b296f5 Update mob_holder.dm 2020-02-17 12:17:33 +01:00
BlackMajor aff71e7f14 Initial Commit. Adds space ruins to station z. 2020-02-17 23:44:06 +13:00
Winter Flare c97111beda Reorganise Food + Balance Tweaks 
-Reorganised -ALL- foods in the crafting menu.
-Made a section for Eastern Dishes, Mexican Dishes, and Sweets
-Made Bowls, Salads, Soups, Eggs Benedict, and Omelettes normal sized.
-Moved Easter Recipies to the food files, fixing it in the process.
-Capitalised a few things.
 2020-02-17 05:32:03 -05:00
GhomandGitHub 66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
GhomandGitHub 3703110dda Makes the mob holder examine less dumb. 2020-02-16 16:10:20 +01:00
kevinz000andGitHub 7ee04aa608 Merge pull request #10998 from Ghommie/Ghommie-cit569 
Something about the in operator and spaceDMM version update.
 2020-02-15 12:17:37 -07:00
kevinz000andGitHub b46dd3246d Merge pull request #10968 from Citadel-Station-13/Ghommie-patch-4 
/datum/element/cleaning cleans your face!
 2020-02-15 12:16:39 -07:00
kevinz000andGitHub f79148d549 Merge pull request #10947 from Ghommie/Ghommie-cit563 
Holopad static fix and a few other mistakes.
 2020-02-15 12:16:23 -07:00
kevinz000andGitHub 957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 
Something about a couple stack trace issues.
 2020-02-15 11:47:30 -07:00
kevinz000andGitHub 76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 
Further mob holder fixes.
 2020-02-15 11:44:25 -07:00
TrilbySpaceClone a1f1a01a81 grammer and quiver 2020-02-15 00:52:19 -05:00
TrilbySpaceClone bbe1ddc0cf silk, bows, and graytide! 2020-02-14 23:04:02 -05:00
GhomandGitHub 0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
GhomandGitHub b0d85c4aea Merge pull request #11070 from Citadel-Station-13/kevinz000-patch-18 
ghosts can not force re rendering of storage to a different size
 2020-02-14 19:22:05 +01:00
GhomandGitHub 64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00
Linzolle 790b7bf9cc sanity check 2020-02-13 15:20:01 -06:00
Linzolle 083a6e4c19 runtime? 2020-02-13 13:29:07 -06:00
Linzolle 9a87087378 message unnecessary 2020-02-13 13:26:19 -06:00
Linzolle f890317810 maybe this will work 2020-02-13 13:02:51 -06:00
Linzolle d22631700c update the fucking craft component because artur forgot to 2020-02-13 12:59:56 -06:00
Artur 7964d768fa Initial Commit 2020-02-13 20:51:52 +02:00
Artur c01f78b8e8 Conflict fix 2020-02-13 17:52:28 +02:00
GhomandGitHub 8b44b02f2d Merge pull request #11044 from Arturlang/TGUI_Next_Uplink 
TGUI Next Uplinks
 2020-02-13 16:50:10 +01:00
GhomandGitHub 7198637463 Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7 
STOP_PROCESSING now also removes from currentrun
 2020-02-13 15:05:51 +01:00
Artur 8c37cfef24 Should work now 2020-02-13 15:26:18 +02:00
kevinz000andGitHub 87097fb059 Update storage.dm 2020-02-13 05:30:44 -07:00
kevinz000andGitHub 3aa3fc3614 Update storage.dm 2020-02-13 05:15:19 -07:00
kevinz000andGitHub 4345f01322 Merge pull request #11021 from Ghommie/Ghommie-cit571 
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
 2020-02-13 04:11:01 -07:00
Artur 21ce2242ac Conflict fix 2020-02-12 16:21:29 +02:00
GhomandGitHub 12b84aa333 Update mob_holder.dm 2020-02-12 12:43:47 +01:00
kevinz000 d8d6a8efb8 lazy-be-gone 2020-02-12 02:15:56 -07:00
kevinz000 33b3d06d4c im lazy 2020-02-12 01:44:28 -07:00
Ghommie e5ab230b26 Monky chokehold deluxe. 2020-02-12 09:32:38 +01:00