shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,071 Commits 5 Branches 0 Tags
b775565a0ac7a5062cfadffad851334a25390946
Commit Graph

2419 Commits

Author SHA1 Message Date
Seris02
c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02
88ae429720 runtime fix 2020-02-22 19:45:57 +08:00
Seris02
84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000
f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Detective Google
ca29246878 adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.) 2020-02-22 00:02:49 -06:00
Ghommie
8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000
a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
Winter Flare
d112556ea3 Fix, New Category, file renames. 
Remove Sweets Category
Add Donut Category
Rename recipies_sushi.dm to recipies_eastern_fish.dm (for sorting in the UI)
Rename recipies_pie.dm to recipies_pie_sweets.dm
Remove Onigiri from Misc (It's in Eastern)
 2020-02-21 09:34:13 -05:00
raspyosu
28485ea108 Merge remote-tracking branch 'upstream/master' 2020-02-21 01:48:50 -05:00
Detective Google
4c10c830bf Merge remote-tracking branch 'upstream/master' into psych+paramedic 2020-02-20 22:17:55 -06:00
Detective Google
a8f863f901 changes - sprites 2020-02-20 22:17:47 -06:00
Ghom
8395ee53e7 Merge pull request #11156 from Psody-Mordheim/Plzgibsynthflesh 
Virology Symptom Update : Now Featuring EVEN MORE PWRGAME
 2020-02-21 02:47:18 +01:00
Ghom
e92183e968 Merge pull request #10541 from Detective-Google/the-p-o-o-l 
adds the POOL to box station
 2020-02-21 02:43:04 +01:00
Ghom
7763475b83 Merge pull request #10572 from Tupinambis/SiliconDefault 
Removes harm prevention clause indicators from relevant sources.
 2020-02-20 15:33:27 +01:00
Ghom
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
kevinz000
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
Ghom
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
kevinz000
2dd5a0cfb8 Merge branch 'master' into hijack 2020-02-19 22:25:31 -07:00
kevinz000
c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000
6f31e1270e Merge pull request #11098 from Trilbyspaceclone/bows! 
Silk into clothing, bows, arrows, quivers and more!
 2020-02-19 19:05:49 -07:00
kevinz000
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
Arturlang
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
Ghom
eb342d1591 Update mood.dm 2020-02-19 17:14:30 +01:00
kevinz000
15c56e6a12 crlf 2020-02-19 07:56:16 -07: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
0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07: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
Ghom
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
Ghom
66d5e0e346 Update station.dm 2020-02-17 01:03:29 +01:00
Ghom
3703110dda Makes the mob holder examine less dumb. 2020-02-16 16:10:20 +01:00
kevinz000
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
kevinz000
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
kevinz000
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
kevinz000
957c6168b6 Merge pull request #11006 from Ghommie/Ghommie-cit570 
Something about a couple stack trace issues.
 2020-02-15 11:47:30 -07:00
kevinz000
76b5dec4bb Merge pull request #11040 from Ghommie/Ghommie-cit573 
Further mob holder fixes.
 2020-02-15 11:44:25 -07:00
Seris02
2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08: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
Ghom
0a1c3bd084 Merge branch 'master' into Ghommie-cit539 2020-02-14 19:42:36 +01:00
Ghom
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
Ghom
64882b8a90 Merge pull request #10993 from Linzolle/bows 
adds the bow
 2020-02-14 08:01:12 +01:00