shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,209 Commits 5 Branches 0 Tags
820eeceb12052d14dcce7527d8599061dcf32cf7
Commit Graph

1950 Commits

Author SHA1 Message Date
kevinz000
f1c9a07f6d Merge pull request #8912 from Ghommie/Ghommie-cit146 
Ports "Headset Channel Descriptions Are No Longer Hardcoded"
 2019-08-04 22:41:49 -07:00
kevinz000
53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes 
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
 2019-08-04 19:09:36 -07:00
kevinz000
27b3cb6656 Merge pull request #9018 from Ghommie/Ghommie-cit171 
Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception"
 2019-08-04 19:04:59 -07:00
Poojawa
d0d6bc37a6 Merge branch 'master' into job-menu-improvements 2019-08-02 11:55:28 -05:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting 
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
 2019-08-02 00:57:05 -07:00
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Poojawa
3499d73f6b Merge remote-tracking branch 'refs/remotes/origin/master' into syntheticbloods 2019-07-31 19:24:39 -05:00
Poojawa
218cbe2dbc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-31 19:09:35 -05:00
Ghommie
ec560c8371 Ports "More robust dorfs." 2019-07-31 22:14:39 +02:00
Trilbyspaceclone
937c809b0b Update action.dm 2019-07-31 12:57:10 -04:00
Ghommie
ec2a3ea778 Ports "Bluespace research updates" and "Teleportation standardization, channels, and interception" 2019-07-31 18:56:00 +02:00
Linzolle
db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
TrilbySpaceClone
606639ce23 part 1 fixing shit 2019-07-29 05:52:49 -04:00
Fermi
d080446a77 Merge branch 'pr/20' 2019-07-28 23:28:19 +01:00
deathride58
a373899ae0 [s] fixes major server crash exploit vector involving notes 2019-07-28 13:08:02 -04:00
Ghommie
78e4c8689b reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code. 2019-07-28 01:04:19 +02:00
Ghommie
72413c893f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-27 01:38:20 +02:00
Poojawa
8c63ea7b6d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into job-menu-improvements 2019-07-26 17:36:46 -05:00
kevinz000
d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
Ghommie
6623dd4896 As if they'd care anyway. 2019-07-24 02:03:52 +02:00
Ghommie
3bd0ba0275 Cleaning up Arousal code & co. 2019-07-23 06:39:53 +02:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -07:00
EgoSumStultus
4a800e1431 blind quirk 2019-07-21 23:48:53 -07:00
Thalpy
15ab1a26a4 Merge branch 'master' into master 2019-07-21 01:50:41 +01:00
kevinz000
08fd6af7fc Merge pull request #8830 from Ghommie/Ghommie-cit114 
Ports the toggleable dark mode to the game!
 2019-07-20 11:57:13 -07:00
kevinz000
08d9732fb8 Merge pull request #8925 from BurgerLUA/Autolathe-Fix 
Makes the autolathe shock wire actually shock you
 2019-07-20 11:49:39 -07:00
kevinz000
94f5573e3a Update nanites.dm 2019-07-19 17:45:44 -07:00
BurgerLua
b2379198aa Makes the autolathe shock wire actually shock you lmao 2019-07-19 02:01:16 -07:00
deathride58
77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15 
Fixes and buffs nano-boost symptom
 2019-07-17 17:53:02 -04:00
deathride58
7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57 
Nanites in non /livings are no longer immune to EMPs
 2019-07-17 17:51:15 -04:00
deathride58
d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54 
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
 2019-07-17 17:48:38 -04:00
Ghommie
ee32e1680f Ports "Replaces radio channel names and keys with defines" 2019-07-17 00:52:41 +02:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
kevinz000
f16328c6e7 Update ert.dm 2019-07-15 16:55:40 -07:00
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01:00
Ghommie
dbb17a258a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:52:34 +02:00
Ghommie
16a7f6e5b2 Merge branch 'master' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit54 2019-07-15 17:46:13 +02:00
Ghommie
fac3e65c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-07-15 17:42:47 +02:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
Ghommie
4df4cbd721 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-07-15 17:23:01 +02:00
Seris02
59f45d3e35 adds abductor replication lab with advanced tools 2019-07-15 15:18:04 +08:00
kevinz000
102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf 
Nerfs nanite pools
 2019-07-14 14:15:53 -07:00
Fermi
8d12d0f017 I am very smart 2019-07-13 20:02:53 +01:00
Thalpy
4c4dbd0e17 Merge branch 'master' into master 2019-07-13 19:33:46 +01:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
kevinz000
e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122 
Rubber toolboxes.
 2019-07-12 07:35:25 -07:00
kevinz000
c30a3aafb6 Update nanites.dm 2019-07-10 22:49:31 -07:00
kevinz000
db05432778 Update nanites.dm 2019-07-10 22:44:21 -07:00
kevinz000
2995b22907 Update nanites.dm 2019-07-10 22:38:43 -07:00