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

1543 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
BlackMajor
8817f04e19 Merge pull request #9747 from Ghommie/Ghommie-cit329 
Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.
 2019-12-10 11:18:55 +13:00
Putnam3145
beddaa1a99 Merge pull request #10053 from Ghommie/Ghommie-cit429 
Fixes some means of eyes blindness not working, removes legacy code.
 2019-12-09 12:40:37 -08:00
Ghommie
414d4b7a90 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit408 2019-12-09 00:04:22 +01:00
Putnam
3e176bb79a should interrupt always 2019-12-08 11:41:08 -08:00
Ghommie
7cc332960b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329 2019-12-07 05:30:07 +01:00
Hatterhat
d1bfe3d840 i hate 2019-12-06 21:43:15 -06:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Ghommie
723690bab0 Demodularize defib disks and projectiles icons. 2019-12-06 23:07:50 +01:00
kevinz000
d217a9f445 Merge pull request #10032 from Ghommie/Ghommie-cit418 
Porting some return type annotations and bad keyword fixes.
 2019-12-05 21:33:12 -07:00
Ghommie
a944ea9db1 considering the gun holds 2 rounds at a time and we have odd amounts in the box, players may become upset about it in the future. 2019-12-06 05:07:34 +01:00
Ghommie
0e3774d73f 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-06 04:47:33 +01:00
Ghommie
238655d599 Fixes eyes blindness a little. 2019-12-06 00:10:50 +01:00
Seris02
0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Ghommie
3c7d2972de Porting some return type annotations and bad keyword fixes, linter stuff. 2019-12-03 03:31:35 +01:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00