shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,910 Commits 5 Branches 0 Tags
648e304ef8b47b24c4e5fa765db414aded9dcbac
Commit Graph

3928 Commits

Author SHA1 Message Date
Ghom
9355e9319b Merge pull request #11110 from Hatterhat/hyper-96-aus-unk 
you kids like extend votes?
 2020-02-24 16:39:16 +01:00
kevinz000
4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N 
Makes all IPC organs look robotic!
 2020-02-24 02:24:06 -07:00
kevinz000
73c03adbbb Merge pull request #11199 from Detective-Google/pai.pai.pai.png 
Lets pAIs hold encryption keys and play music.
 2020-02-24 02:23:17 -07:00
Hatterhat
b89a2314a2 mmm that's compiling i don't like that 2020-02-22 16:17:51 -06:00
Ghom
520f5eab83 Merge pull request #11191 from YakumoChen/beelord 
Beegions
 2020-02-22 22:24:20 +01:00
Ghom
b7fab93209 Merge pull request #11186 from Putnam3145/fixed-flavor 
Fixed temp flavor text (for real)
 2020-02-22 15:09:58 +01:00
Putnam
d328d554ba Reduced copypasta 2020-02-22 02:38:57 -08: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
YakumoChen
418374be06 beegion 2020-02-21 17:56:14 +00:00
YakumoChen
2f2ddbad5a removes density from skulls 2020-02-21 12:07:58 +00:00
YakumoChen
34f1b5d1c8 legion heads now swarm 2020-02-21 10:36:57 +00:00
Putnam
146b2a35f2 fixed temp flavor text (for real) 2020-02-21 00:26:42 -08:00
TrilbySpaceClone
7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05: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
4649183a47 Merge pull request #11154 from Kraseo/fuck-nightmares 
Fixes nightmares deleting guns with flashlights
 2020-02-20 20:52:29 +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
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
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
Ghom
32c001f264 Merge pull request #11140 from Citadel-Station-13/kevinz000-patch-15 
buffs pai radio short 5 -> 3 minutes
 2020-02-20 11:26:17 +01:00
Ghom
7d8ae07fa0 Merge pull request #11139 from Citadel-Station-13/kevinz000-patch-12 
projectiles now pierce through pAIs no matter what
 2020-02-20 11:09:03 +01:00
Ghom
c1f8deb4a5 Merge pull request #11141 from Citadel-Station-13/kevinz000-patch-17 
removes pai fulltile opacity
 2020-02-20 11:08:27 +01:00
kevinz000
9589c3116b Merge pull request #11115 from Ghommie/Ghommie-cit583 
Something more about runtime errors.
 2020-02-19 19:03:01 -07:00
kevinz000
b983aa75ea Merge pull request #11145 from Ghommie/Ghommie-cit586 
Something about pAIs and silicon access priviledges.
 2020-02-19 18:59:10 -07:00
Kraseo
cd56e29a98 drink my ass kevinz 2020-02-20 00:18:43 +01:00
Arturlang
796f51b557 Merge branch 'master' into TGUI_Next_Nanites 2020-02-20 00:52:55 +02:00
Kraseo
f532c1a444 i spent 2 hours figuring out how to fix this 2020-02-19 18:40:30 +01:00
Ghommie
057b6f591c HEEY 2020-02-19 14:23:12 +01:00
Ghommie
37ba75ec12 Fixing addiction moodlets not going away and secret sauce recipe paper. 2020-02-19 14:07:11 +01:00
Ghom
08c86ec1ea Merge pull request #11091 from BlueWildrose/master 
Podpeople species tail wag fix; also lifebringer name fix
 2020-02-18 17:11:50 +01:00
Ghommie
698f0b8177 Something about pAIs and silicon access priviledges. 2020-02-18 16:20:44 +01:00
kevinz000
d04126226b Merge pull request #11082 from Hatterhat/preservahyde 
preservahyde, alt title "what if i didnt die from having shit rng and a single epipen"
 2020-02-18 02:21:37 -07:00
kevinz000
918618831c Merge pull request #11109 from Citadel-Station-13/Ghommie-patch-3 
Something about gibs and mob biotypes.
 2020-02-18 02:17:32 -07:00
kevinz000
d6fe0df7ac Update pai.dm 2020-02-18 02:10:03 -07:00
kevinz000
9264163d93 Update pai.dm 2020-02-18 01:47:20 -07:00
kevinz000
6a97006b12 Update pai_defense.dm 2020-02-18 01:41:28 -07:00
BlueWildrose
78fcd706b3 Requested changes, podpeople.dm 2020-02-17 19:41:30 -07:00
Lin
a37e1ab129 Merge pull request #11093 from Ghommie/Ghommie-cit580 
Something about blood and species handle_chemicals()
 2020-02-16 12:36:41 -06:00
Ghommie
23ae9996d2 Something more about runtime errors. 2020-02-16 15:24:15 +01:00
kevinz000
379c914099 Merge pull request #10704 from Ghommie/Ghommie-cit529 
More Runtimenator fixes.
 2020-02-16 05:10:19 -07:00
Trilbyspaceclone
a8d45f8361 Update crab.dm (#11105) 2020-02-16 07:39:56 +01:00
Ghom
abf7d2423a Update death.dm 2020-02-16 07:17:53 +01:00
TrilbySpaceClone
cba6667332 it could work 2020-02-15 18:42:50 -05: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
ee9b38017e Merge pull request #10995 from Ghommie/Ghommie-cit568 
Something about cryopods.
 2020-02-15 12:17:02 -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
b9e8be5784 Merge pull request #10940 from Ghommie/Ghommie-cit560 
First tweak to cargo reagents selling.
 2020-02-15 12:15:50 -07:00
kevinz000
6e2e7e29d1 Merge pull request #11072 from Ghommie/Ghommie-cit576 
Doubled halved flavor text max length and removed crappy code.
 2020-02-15 11:46:00 -07:00
kevinz000
29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -07:00
Ghom
8e3673480f Merge pull request #11048 from Trilbyspaceclone/patch-283 
Blood Drunk Miner now uses a PKA
 2020-02-15 09:05:45 +01:00