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

11206 Commits

Author SHA1 Message Date
Putnam3145 634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -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
Putnam3145 5945f30523 Merge pull request #10225 from Ghommie/Ghommie-cit475 
Two slimepeople fixes.
 2019-12-17 11:22:30 -08:00
BlackMajor 95c0eddc2a Merge pull request #10072 from Useroth/new-tg-plants 
Ported bamboo stuff from tg.
 2019-12-18 01:02:29 +13: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 3f06661de5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit453 2019-12-17 03:34:11 +01:00
Ghommie 6b7dcbceb0 Porting a few martial art code updates. 2019-12-17 03:19:07 +01:00
Lin 6f70ba1477 Merge pull request #10181 from Ghommie/Ghommie-cit463 
Fixing a few pill bottle issues with the ChemMaster.
 2019-12-17 01:08:27 +00: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
Ghommie 1c3682cd15 Brings carbon action intent hotkeys down to living. 2019-12-17 00:03:39 +01: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
kappa-sama 9f71900052 oop 2019-12-15 23:29:01 -05:00
kappa-sama b6c9c73372 this cannot go wrong 2019-12-15 23:28:17 -05:00
kevinz000 b4bd2cbb5c Update preferences.dm 2019-12-15 20:20:04 -07: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
Ghommie 843f4ed0da FLAK 2019-12-16 02:44:58 +01:00
BlackMajor 74cc1ec547 Merge pull request #10177 from BlackMajor/FIST 
NUCLEAR FIST. A new wizard spell involving punching people so hard they explode.
 2019-12-16 14:14:35 +13:00
kevinz000 0190054c97 Update carbon.dm 2019-12-15 17:08:41 -07:00
kevinz000 e496b7c397 Update eyes.dm 2019-12-15 17:02:43 -07:00
kevinz000 762cd00a5f Update eyes.dm 2019-12-15 16:55:56 -07:00
Unknown ad88481f3e OwO whats this notices your 2019-12-15 16:45:34 -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
Putnam3145 7aa454dbbb Merge pull request #10197 from Ghommie/Ghommie-cit465 
fixing double-flavour (and bland custom) ice creams.
 2019-12-15 15:24:17 -08:00
Ghommie 22aba489e3 Fixes ranged syndicate mobs stormtrooper training: The port. 2019-12-16 00:21:28 +01:00
Unknown 008c4ef822 according to all known laws of aviation 2019-12-15 16:18:42 -07:00
Unknown 9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Ghommie 0a4a2acbab fixing double-flavour ice creams. 2019-12-16 00:00:58 +01: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
Artur 58f4f58cd2 Slaughter demons shouldnt bleed 2019-12-16 00:05:51 +02:00
Ghommie d3d1f8328f compiles now. 2019-12-15 22:16:02 +01:00
Ghommie 80f47872d7 My head splodes. 2019-12-15 20:31:36 +01:00
BlackMajor 4b177c4956 Adjusted NF balance 2019-12-16 01:20:14 +13: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