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

1858 Commits

Author SHA1 Message Date
Unknown
0b02439b08 Puts an end to the Christmas Menace 2020-01-02 03:53:04 -07:00
Lin
b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Seris02
9653dc470b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into autoooc 2019-12-30 22:48:39 +08:00
kevinz000
7e5729ffaf Merge pull request #10168 from Ghommie/Ghommie-cit459 
Allows ghost mentors to orbit around the target instead of setting their view to theirs.
 2019-12-30 00:17:46 -08:00
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
Ghommie
edd05cebea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit367 2019-12-30 00:28:36 +01:00
Seris02
3d3407363c auto ooc 2019-12-29 18:48:00 +08:00
kevinz000
f14448109d Update sprint.dm 2019-12-28 01:34:29 -08:00
kevinz000
a7323fa424 Update stamina.dm 2019-12-28 01:33:39 -08:00
Lin
d562a5ba27 Merge pull request #10212 from Ghommie/Ghommie-cit471 
Ports some hud and update_icon code updates.
 2019-12-28 04:07:03 +00:00
Commandersand
60905cc09b loadout 2019-12-27 12:44:08 -06:00
Commandersand
815e57697d vending 2019-12-27 12:29:39 -06:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Ghom
05bde370ec Merge pull request #10250 from Michiyamenotehifunana/polyshorts-for-digis 
Gives Polychromic Shorts a Digitigrade Worn Icon State and Modernizes Polychromic Clothing Code
 2019-12-26 16:11:54 +01:00
Hatterhat
f3fed71e08 ah, the wonders of atomization 2019-12-24 21:28:32 -06:00
Hatterhat
681508482c magazine metal cost tweaks, speedloader in AIB 2019-12-24 04:15:25 -06: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
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
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
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
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
3dc00519fc Merge pull request #9910 from Ghommie/Ghommie-cit390 
Unmodularize gamemodes folder.
 2019-12-19 23:23:20 +00:00
Lin
42d8228c75 Merge pull request #9722 from Ghommie/Ghommie-cit320 
Umodularize saycode and meat slabs.
 2019-12-19 23:03:48 +00:00
Lin
66c6659681 Merge pull request #10160 from Ghommie/Ghommie-cit453 
Ports improved and simplier fire alarms.
 2019-12-19 23:00:52 +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
Putnam
9ec2c8a7f1 MKUltra made double opt-in 2019-12-19 09:54:34 -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
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
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
80402a0d88 Ports some hud and update_icon code updates. 2019-12-16 23:29:20 +01: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