shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
30,712 Commits 5 Branches 0 Tags
4c10c830bf94de5f41e8c06bca0de5a856ad46f4
Commit Graph

19834 Commits

Author SHA1 Message Date
Trilbyspaceclone 0f5c8db456 Merge branch 'master' into donut 2019-12-17 15:12:51 -05: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
Trilbyspaceclone 952880eecc Update drinks.dm 2019-12-17 15:01:23 -05:00
Putnam3145 c0e548427b Merge pull request #10076 from Ghommie/Ghommie-cit437 
Fixes alien tech node not being unlockable with subtypes of the accepted items.
 2019-12-17 11:58:39 -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 37cfec22aa Merge pull request #10066 from Sishen1542/aaaaaaaa 
neovgre qol changes
 2019-12-17 11:40:43 -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 0adcb900c1 Merge pull request #10155 from Seris02/windowfix 
adds some distance checks to some things
 2019-12-17 11:34:13 -08:00
Putnam3145 634154e7cf Merge pull request #10157 from Ghommie/Ghommie-cit452 
Ports "Fixes powernet avail checks"
 2019-12-17 11:33:33 -08:00
Putnam3145 10f0fa6868 Merge pull request #10203 from DeltaFire15/mechaccess 
Nukies and deathsquaddies can now finally fix their mechs internal fires
 2019-12-17 11:32:56 -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
Trilbyspaceclone 47df4f452d Update drink_reagents.dm 2019-12-17 14:26:21 -05: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
Seris02 433cc6c05a makes trait blacklisting remove random positives instead of NULLING EVERY SINGLE FUCKING QUIRK 2019-12-17 19:59:01 +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
Putnam ef750e8ace contamination nerf 2019-12-16 18:54:59 -08: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 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
Trilbyspaceclone c036c2c835 Update drink_reagents.dm 2019-12-16 19:05:16 -05:00
kevinz000 2b254653b6 typepath 2019-12-16 16:27:00 -07:00
Ghommie 1c3682cd15 Brings carbon action intent hotkeys down to living. 2019-12-17 00:03:39 +01:00
kevinz000 4fa744e78d radio short 2019-12-16 15:42:37 -07:00
kevinz000 2c228571f3 nerfs 2019-12-16 15:39:22 -07:00
Ghommie 80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
Trilbyspaceclone fe1576583c Update code/modules/vending/cola.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-16 15:01:16 -05: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
kevinz000 1701811fb6 kay 2019-12-16 11:35:04 -07:00
kevinz000 d9cd90c3c5 Update supply.dm 2019-12-16 11:31:03 -07:00
Ghommie 447f416ca6 Merge branch 'Ghommie-cit470' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit471 2019-12-16 19:10:07 +01:00
Ghommie 93fbc17428 ports "Standardize obj/updateicon() and update_icons() to update_icon()" 2019-12-16 17:58:50 +01:00
kevinz000 aa14713fdd nerfs 2019-12-16 08:12:49 -07:00
kevinz000 b3ad352a96 stuff 2019-12-16 08:10:41 -07: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
MrJWhit 8209fe5159 Update encryptionkey.dm 2019-12-16 08:19:12 -05:00