shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph

2316 Commits

Author SHA1 Message Date
Ghommie 53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Hatterhat 681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06:00
kevinz000 fb77d07d52 plushies woohoo 2019-12-23 16:56:43 -08:00
Ghommie d571bbd292 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-24 00:07:32 +01:00
Ghommie e1949b0131 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-23 19:02:20 +01:00
Ghommie f3e32641bf fukken donators 2019-12-23 14:45:00 +01:00
Ghommie 14c73b7d01 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 14:21:08 +01:00
Lin 9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator 
Donator Item - Ready For Review
 2019-12-23 05:29:06 +00:00
deathride58 2eaffd57c3 Update custom_items.dm 2019-12-22 23:16:40 -05:00
Ghommie d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghommie b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00
Ghommie e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
LetterJay 632e2cd8a1 Update custom_items.dm 2019-12-22 14:37:58 -06:00
LetterJay 98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:10 -06:00
LetterJay 28e909ad74 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:05 -06:00
LetterJay 1d933dd0f3 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:00 -06:00
LetterJay 4def28ddf9 Update __donator.dm 2019-12-22 14:16:40 -06:00
Seris02 18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Jay 29b25841b9 FUUUUUUUUUCK v2 2019-12-21 20:58:50 -06:00
Jay 4730413431 FUUUUUUUUUUUCK 2019-12-21 18:05:34 -06:00
Trilbyspaceclone 0b63e79098 Merge branch 'master' into glassware 2019-12-21 15:41:45 -05:00
Ghommie 395457f7ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit471 2019-12-21 17:59:32 +01:00
Michiyamenotehifunana 3920e6a38d Merge remote-tracking branch 'upstream/master' into polyshorts-for-digis 2019-12-21 22:22:12 +08:00
Michiyamenotehifunana 0b2568a9cf Modernizes Polychromic Uniform Code 
No more modular_citadel, but the neck polychrome crap needs more work in another PR
 2019-12-21 21:38:04 +08:00
kevinz000 97f678b542 Merge pull request #10058 from Ghommie/Ghommie-cit432 
Spinfusor nerf, cause a 7k cost supply pack containing 32 explosive munitions that work just fine without the gun is just pure balance.
 2019-12-20 23:20:49 -07:00
Putnam c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Ghommie 9db79ff958 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-20 23:40:21 +01:00
Michiyamenotehifunana 832d58a071 Adds a hacky framework for digitigrade polyclothes 
also adds a digitigrade state for polychromic shorts
 2019-12-20 19:44:22 +08:00
Lin 42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
nik707 dd62a9ca87 Merge pull request #10084 from Hatterhat/i-dont-test-my-code 
i dont make good code
 2019-12-19 14:10:18 -06:00
Putnam f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08: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
Trilbyspaceclone ddd3676903 Merge branch 'master' into glassware 2019-12-17 15:18:30 -05:00
Putnam3145 cfe35ce2fd Merge pull request #10167 from Ghommie/Ghommie-cit458 
Fixing some not safe for work oddity.
 2019-12-17 11:52:41 -08:00
BlackMajor 03d2e9eb6d Compress secK9 2019-12-17 23:32:51 +13:00
Ghommie 5bf252a58c Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls." 2019-12-17 01:57:56 +01:00
Ghommie 80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01:00
kevinz000 78e9b82eb6 trying too hard 2019-12-15 23:03:44 -07:00
Unknown 73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07: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
Ghommie 8a7c559746 Allows ghost mentors to orbit around the target instead of changing their view to the mob's. 2019-12-13 10:45:31 +01:00
Ghommie 221291f525 Fixing some not safe for work oddity. 2019-12-13 08:02:39 +01:00
nik707 cdeb4733aa Merge pull request #9863 from BlackMajor/Yote 
No adrenals for borgs please
 2019-12-12 23:50:34 -06:00
Ghommie 3fcb7808fd args 2019-12-13 02:30:17 +01:00
Ghommie 8ec4bdaef5 Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs. 2019-12-13 02:30:11 +01:00
BlackMajor 83a707ee93 Removes medihounds, same treatment as janihounds 2019-12-13 13:48:22 +13:00
Lin 9ec8458803 Merge pull request #9983 from Ghommie/Ghommie-cit408 
refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open.
 2019-12-10 23:52:31 +00:00
Jay 0670db4e63 initial push for a large request - DNM 2019-12-10 08:03:00 -06:00
Lin 78ed78ddbc Merge pull request #10116 from Putnam3145/nolewd-fix 
Makes genital enlargement chems properly opt-outable
 2019-12-10 02:31:44 +00:00