shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,087 Commits 5 Branches 0 Tags
bc70bc38823eddc79f260eebe82c88f620fa0ece
Commit Graph

3397 Commits

Author SHA1 Message Date
r4d6
bc70bc3882 Fix the nose boop. 2019-12-20 18:10:02 -05:00
Ghom
6d824c99cf Merge pull request #10051 from kappa-sama/patch-9 
puts our legion more up to date with tg's
 2019-12-20 14:25:09 +01:00
Lin
42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
kevinz000
23f7815c52 Merge pull request #10204 from r4d6/patch-2 
Port boops and handshakes
 2019-12-19 04:01:52 -07:00
kevinz000
dcca9eb0d6 Merge pull request #10223 from BlackMajor/Yeehaw 
Removes Security K9 dogborg. The last of the infinity dogborg removals. (same treatment as the others)
 2019-12-19 03:24:36 -07:00
Ghommie
f945577655 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit320 2019-12-18 19:20:38 +01:00
Putnam3145
6b8f9427d0 Merge pull request #10153 from Linzolle/fireman-clarity 
make unable to carry fireman message more clear when unable to carry non-humans
 2019-12-17 12:09:08 -08:00
Putnam3145
b8c5290011 Merge pull request #10026 from Linzolle/neck-slice 
Neck slice
 2019-12-17 11:58:00 -08:00
Putnam3145
ed44b3130c Merge pull request #10172 from Ghommie/Ghommie-cit460 
Porting several quirks code updates.
 2019-12-17 11:51:03 -08:00
Putnam3145
7017ab243b Merge pull request #10216 from Ghommie/Ghommie-cit474 
Porting a few martial art code updates.
 2019-12-17 11:47:19 -08:00
Putnam3145
7a6541936c Merge pull request #10111 from kappa-sama/patch-11 
send help please, or how i vowed to kill kevinz (you can now strip people while aggrograbbing)
 2019-12-17 11:38:35 -08:00
Putnam3145
670141edf7 Merge pull request #10209 from Ghommie/Ghommie-cit470 
ports "Standardize obj/updateicon() and update_icons() to update_icon()"
 2019-12-17 11:26:36 -08:00
Ghommie
f2cf146255 Two slimepeople fixes. 2019-12-17 12:49:04 +01:00
BlackMajor
5245898c25 whoops 2019-12-17 23:46:15 +13:00
BlackMajor
03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie
6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Lin
237fbaa02d Merge pull request #10180 from Ghommie/Ghommie-cit462 
[s] virtual reality component improvements, fixes and documentation.
 2019-12-17 01:05:10 +00:00
Putnam3145
6365a430cc Merge pull request #10208 from Ghommie/Ghommie-cit469 
Fixes AI being unable to talk through the holopad.
 2019-12-16 10:57:26 -08:00
Ghommie
93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
Ghommie
9c5a66af67 Fixes AI being unable to talk through the holopad. 2019-12-16 15:58:10 +01:00
r4d6
51a17dff94 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:42 -05:00
r4d6
c291511ab6 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:35 -05:00
r4d6
bfbb6231a5 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:28 -05:00
r4d6
2d488bee52 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:21 -05:00
r4d6
3e86e2207e Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:23:07 -05:00
r4d6
21b7fb0759 Commit suggestions 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 09:22:58 -05:00
r4d6
7142894ce7 Make the boop louder. 2019-12-16 09:02:01 -05:00
r4d6
2e4187b7c8 Add a boop sound effect 2019-12-16 08:56:51 -05:00
r4d6
a4d6911324 Update code/modules/mob/living/carbon/carbon_defense.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 07:48:29 -05:00
r4d6
13aaebcd22 Update code/modules/mob/living/carbon/carbon_defense.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-12-16 07:48:22 -05:00
r4d6
e8d43dac87 Port boops and handshakes 2019-12-16 06:27:18 -05:00
Useroth
8151a1f3ff Merged master into this branch. 2019-12-16 12:06:30 +01:00
kevinz000
ba7a3f5fd2 Merge pull request #9971 from Xantholne/xantholne-christmas01 
Adds the Christmas Clothes you never knew you wanted.
 2019-12-15 20:11:09 -07:00
Putnam3145
363380405e Merge pull request #10198 from Ghommie/Ghommie-cit466 
Fixes ranged syndicate mobs stormtrooper training: The port.
 2019-12-15 15:42:13 -08:00
Ghommie
22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. 2019-12-16 00:21:28 +01:00
Unknown
9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
kappa-sama
f8a05b5ae1 perhaps 2019-12-15 17:31:49 -05:00
Ghommie
80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
Putnam3145
2e9503f6d7 Merge pull request #10166 from Ghommie/Ghommie-cit457 
Ports "Roundstart borg brains no longer decay."
 2019-12-14 20:37:57 -08:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
3891c91799 virtual reality component improvements, fixes and documentation. 2019-12-14 17:19:48 +01:00
kevinz000
659b78d8b8 Merge pull request #10162 from BlackMajor/Yeehaw 
Removes medihounds (actually just makes them a medical aux sprite)
 2019-12-13 16:52:22 -07:00
Artur
9faf3d1dac Mooaar fixeees 2019-12-14 01:01:38 +02:00
Ghommie
b39ae815f3 Porting several quirks code updates. 2019-12-13 16:12:04 +01:00
Ghommie
2611023488 Ports "Roundstart borg brains no longer decay." 2019-12-13 07:33:45 +01:00
nik707
cdeb4733aa Merge pull request #9863 from BlackMajor/Yote 
No adrenals for borgs please
 2019-12-12 23:50:34 -06:00
BlackMajor
83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
BlackMajor
725414bd03 Merge pull request #9894 from Putnam3145/real-explosion-fix 
[TESTMERGE] Explosion/bomb armor rework
 2019-12-13 10:20:33 +13:00
Putnam3145
9234876ad1 Merge pull request #10156 from Ghommie/Ghommie-cit451 
Fixing character setup preview icons.
 2019-12-12 09:30:34 -08:00