shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,264 Commits 5 Branches 0 Tags
4d6b9f5da1f1ef6afa8be2f6a0e72dfcba4fc1a8
Commit Graph

1526 Commits

Author SHA1 Message Date
BlackMajor
4d6b9f5da1 Merge pull request #8537 from Ghommie/Ghommie-cit28 
Fixes emags wasting charges on un-emaggable stuff.
 2019-08-28 13:54:03 +12:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
chefferz
0f4f20c29a Update buffs.dm 2019-08-23 03:50:28 -04:00
chefferz
bd1dae9082 Update buffs.dm 2019-08-23 03:46:13 -04:00
chefferz
580ea38199 Update buffs.dm 2019-08-23 03:45:44 -04:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
BlackMajor
13f27c040e Merge pull request #8848 from Citadel-Station-13/trait_blacklisting 
Trait blacklisting system: Blacklists Mute and Brain Tumor from ALL heads of staff. Blacklists pacifist + paraplegic from HoS. Blacklists Paraplegic/nolegs from CE. Blacklists phanosthing/no-recognize-faces from HoP
 2019-08-18 15:33:08 +12:00
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
kevinz000
2cdfa9cf2f Merge pull request #9126 from Sishen1542/viro-cures 
Adds more variety in virus cures, more consistent difficulty scaling.
 2019-08-15 01:12:12 -07:00
deathride58
9010b9003a Merge pull request #8930 from Citadel-Station-13/kevinz000-patch-54 
Fixes nanite viruses take two
 2019-08-14 15:01:33 -04:00
Sishen
382487fdc2 viruseseses-cures 2019-08-13 05:32:37 -04:00
kevinz000
69884d1abe Merge pull request #9062 from Trilbyspaceclone/patch-207 
Makes smile not as horrable.
 2019-08-11 10:08:45 -07:00
Fermi
1fb07e286a Removing reviewer comments incase of fullmerge. 2019-08-08 19:53:07 +01:00
Thalpy
2256bbb63c Merge branch 'master' into master 2019-08-07 09:30:53 +01:00
kevinz000
2959a87892 Merge pull request #9022 from Ghommie/Ghommie-cit175 
Ports "More robust dorfs."
 2019-08-07 00:51:19 -07:00
kevinz000
a845b5ae0c Merge pull request #8986 from Ghommie/Ghommie-cit163 
reworked ninja stealth, made ninja shoes completely silent, cleaned up scarily old code.
 2019-08-07 00:49:23 -07:00
kevinz000
6db8d9aef4 Merge pull request #9017 from Trilbyspaceclone/patch-205 
Ports "Some stealth box changes #45332" Aka nerfing Stealth boxes
 2019-08-07 00:48:12 -07:00
Thalpy
53e9c140cf Merge pull request #22 from Citadel-Station-13/master 
YARR
 2019-08-06 16:08:16 +01:00
Trilbyspaceclone
7a22e73a79 Update speech.dm 2019-08-06 08:47:10 -04:00
Ghommie
8978f0ecf9 Defaults the teleportation forceMove arg to TRUE. 2019-08-05 18:19:48 +02:00
Thalpy
5795f6bbe2 Merge branch 'master' into master 2019-08-05 09:09:36 +01:00
kevinz000
aea2f6f523 Merge pull request #8900 from Seris02/spaceruinsyee 
Abductor Replication Lab space ruin - take 2
 2019-08-05 00:55:40 -07:00
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
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
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
kevinz000
d976dd016a Merge remote-tracking branch 'origin/master' into trait_blacklisting 2019-07-25 15:20:46 -07:00
kevinz000
1028fe458a Merge pull request #8909 from Ghommie/Ghommie-cit143 
Fixes named arg Knockdown calls.
 2019-07-22 20:17:30 -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
Thalpy
9c7b1dee97 Merge branch 'master' into master 2019-07-15 21:23:04 +01: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