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

849 Commits

Author SHA1 Message Date
BlackMajor
aabb39a364 Revert "Merge branch 'master' into Yeehaw" 
This reverts commit 30e3edaac1, reversing
changes made to 62c8fce043.
 2020-01-02 22:06:31 +13:00
BlackMajor
3239acf74d Sync 2020-01-02 22:02:55 +13: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
Ghommie
187b9bb13a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit483 2019-12-23 05:10:38 +01:00
Seris02
382c5d057a updates ratvar coat 2019-12-23 12:02:05 +08:00
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08: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
Ghom
19fc981cc1 Merge pull request #9596 from Linzolle/abductor-update 
Bring abductors up-to-date with /tg/.
 2019-12-21 11:15:29 +01:00
Ghom
d52a469933 Merge pull request #10142 from Trilbyspaceclone/patch-244 
Feast or Famine is shit. Makes CE hardsuit raditation proof hat wise, buffes its rest of body by 5
 2019-12-20 13:36:02 +01:00
Ghom
9567d53007 I'm a god. How can you defeat a god? What a grand and intoxicating innocence, how can you be so naive? 2019-12-20 13:24:48 +01:00
Lin
138b460af3 Merge pull request #10079 from Ghommie/Ghommie-cit438 
Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove()
 2019-12-19 23:26:53 +00:00
Ghommie
a46982efe3 F 2019-12-19 17:40:22 +01:00
Ghommie
fb2b259d92 Ports "Refactors can_see_reagents" 2019-12-19 17:17:18 +01:00
Linzolle
70e50e57cd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-17 20:21:49 -06:00
Unknown
9bfba1d1d9 Merge branch 'master' into xantholne-christmas01 2019-12-15 16:14:37 -07:00
Putnam3145
c39a5d0462 Merge pull request #10011 from Arturlang/Bloodsuckers 
Bloodsuckers, or, yknow, vampires.
 2019-12-15 14:41:36 -08:00
Lin
cce63507d1 Merge pull request #9970 from Ghommie/Ghommie-cit402 
they're pretty bad, I'm not sure how these actually got in actually. thanks kevin
 2019-12-15 00:16:34 +00:00
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07:00
Ghommie
79328012b0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit402 2019-12-13 03:41:22 +01:00
Trilbyspaceclone
a7c8fb6470 corrects/adds a new dog fashion to telegram hat 2019-12-11 12:43:07 -05: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
Trilbyspaceclone
d2a8c6c220 Feast or Fammin is shit, 
more at 11
 2019-12-10 14:51:01 -05: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
Linzolle
1e2a4f606c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update 2019-12-08 14:17:00 -06:00
Artur
4711eb0987 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-07 15:53:11 +02:00
Ghommie
019ab63e09 Fixes reactive armor onmob overlays not updating when toggled and reactive teleport armor still using forceMove() 2019-12-07 02:06:51 +01:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Putnam3145
6b2d3b116d Merge branch 'master' into Ghommie-cit430 2019-12-05 20:53:14 -08:00
Ghommie
9ca7bb759c Ports "Slightly improves visible and audible messages." 2019-12-06 02:02:12 +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
Seris02
2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
TrilbySpaceClone
e1717bb534 Merge branch 'master' into crow 2019-12-03 23:45:05 -05:00
Seris02
72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Artur
f48d8016d5 Merge remote-tracking branch 'upstream/master' into Bloodsuckers 2019-12-01 13:51:57 +02:00
Putnam3145
1d91e1acf4 Merge pull request #10016 from deathride58/mousedropfixes 
Mousedrop fixes - Adds return value to item mousedrop and fixes bugs with the few things that override it
 2019-11-30 22:51:42 -08:00
Seris02
b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00
deathride58
b1fca2b74b Mousedrop fixes - Adds return value to item mousedrop and fixes current bugs with the few things that make use of it 2019-11-29 22:59:37 -05:00
Artur
02048ce009 Bludsuckers 2019-11-29 21:28:14 +02:00
Putnam3145
4f018b070f Merge pull request #9996 from Ghommie/Ghommie-cit413 
Fixes tinfoil hats giving random traumas.
 2019-11-29 06:16:36 -08:00
Unknown
233ca30cd6 Merge branch 'master' into xantholne-christmas01 2019-11-28 23:21:36 -07:00
kevinz000
4183d00da2 Merge pull request #9966 from Ghommie/Ghommie-cit400 
Ports elements: Lightweight shared/global components.
 2019-11-28 23:08:32 -07:00
kevinz000
f287af694b Merge pull request #9969 from Linzolle/hat-man-bad 
revert knocking people's hats off
 2019-11-28 23:04:34 -07:00
Ghommie
7990d1328b Fixes tinfoil hats giving random traumas. 2019-11-29 06:48:52 +01:00
Ghommie
3b8aebbbc2 refactoring altclick interaction to allow parent calls without forcing the turf contents stat menu open. 2019-11-29 00:40:16 +01:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Ghommie
4a3a7c841a Removes literally atrocious polka dotted accessories. 2019-11-28 03:54:38 +01:00