shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
26,972 Commits 5 Branches 0 Tags
d6b1b7603761a2b6e3abb4b253fb6494de2dde0d
Commit Graph

212 Commits

Author SHA1 Message Date
Unknown
73abc2ae40 Merge branch 'master' into xantholne-christmas01 2019-12-14 17:15:00 -07: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
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Seris02
2ce79828b8 ratvar coat updated 2019-12-05 20:46:59 +08:00
Seris02
72e5e17c51 ratvarian and narsian winter coats 2019-12-03 18:16:36 +08:00
Seris02
b5f732c838 formal and cc winter coats + start of cult coats 2019-12-01 04:06:03 +08:00
Unknown
233ca30cd6 Merge branch 'master' into xantholne-christmas01 2019-11-28 23:21:36 -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
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
Linzolle
829cc3d81c Revert "Merge pull request #9613 from Linzolle/hat-toss" 
This reverts commit d67b7f620d, reversing
changes made to dabfba8a0d.
 2019-11-27 20:23:33 -06:00
Ghommie
a5298dac7e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-27 21:44:56 +01:00
BlackMajor
c81d1fe7a3 Merge pull request #9867 from Ghommie/Ghommie-cit375 
Ports "examine-code refactor"
 2019-11-25 11:31:03 +13:00
Ghommie
66a97cb224 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit310 2019-11-22 05:17:42 +01:00
Seris02
60def2a9fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-21 13:08:23 +08:00
Ghommie
a52e292cc8 Ports "examine-code refactor"... part 1... 2019-11-19 03:28:06 +01:00
Seris02
468b6eb609 mining winter coat shtuff 
- adds the mining winter coat to mining wardrobes and mining lockers
 2019-11-17 22:27:09 +08:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
Seris02
dea5019bc9 cosmic winter coat yeeeehaw 2019-11-17 20:06:01 +08:00
Seris02
7d99508bd0 adds janitor winter coat 2019-11-17 15:45:12 +08:00
Seris02
b7f4580414 robotics winter coat 2019-11-17 11:50:56 +08:00
Seris02
8db64df364 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintergalorefix 2019-11-16 16:54:27 +08:00
Seris02
e0e3c510d4 adds QM, CE, HoS, HoP, genetics, chemistry, viro, and RD winter coats 2019-11-16 15:31:20 +08:00
Ghommie
20bafdd855 Unmodularize phantom thief glasses, missing durathread headwear sprites and space-nam clothing. 2019-11-03 03:23:59 +01:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
kevinz000
329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again 
fix blood overlays again
 2019-10-27 17:21:55 -07:00
Anonymous
203509b405 Poll said its DAB 2019-10-27 16:27:03 +03:00
MMMiracles
8fb0a68feb Adds Hat Throwing (#45355) 
* adds hat throwing on people and borgs

* clothing flags, hats can knock off non-items, borg hat blacklist check

* prevents hats with items in them from being able to land on heads

* removes extra equip, hats can go on the hatless again, tinfoil fix

* if

* bit flag
 2019-10-25 16:19:19 -05:00
Linzolle
9e89e898ee not again 2019-10-25 15:58:10 -05:00
Anonymous
dcb4c6ae04 Merge branch 'master' into assu 
...and its still coming together...
 2019-10-25 10:31:07 +03:00
kevinz000
da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
Anonymous
f592aca594 Merge branch 'master' into assu 2019-10-24 17:18:26 +03:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Anonymous
29f89ac3a9 Merge branch 'master' into assu 2019-10-23 13:32:39 +03:00
Poojawa
7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58
30eafc305c Merge pull request #9246 from Linzolle/taur 
[READY] some missing icons + sprite changes for taur suits
 2019-10-21 21:19:05 -04:00
Anonymous
2078fdae66 GOD-- 
--DAMN IT!
 2019-10-21 16:26:31 +03:00
Anonymous
32d2476112 Moves stuff from modular, updates sprites 
Also, digitigrade variant is corrected, hopefully.
 2019-10-21 15:24:06 +03:00
Ghommie
e991328087 progress 2019-10-19 15:02:56 +02:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Thalpy
1eccc93137 Oh it's so good 2019-10-15 10:44:35 +01:00
Thalpy
1b170fe2b7 Costume for meee 2019-10-15 10:27:31 +01:00
Linzolle
e009a4cc3d Revert "pooj fixed this anyway" 
This reverts commit 6ce8db8d7b.
 2019-10-05 22:15:48 -05:00
Linzolle
4fc9385e44 oops 2019-10-05 10:40:31 -05:00
Linzolle
6ce8db8d7b pooj fixed this anyway 2019-10-05 10:38:17 -05:00
Poojawa
0482973e8f Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-01 22:38:12 -05:00
kevinz000
250c6ed986 Merge pull request #9367 from Poojawa/totally-radical 
Totally RADical. Rad levels for Medhud, radiation flags added to storage, suits.
 2019-10-01 00:12:32 -07:00
Poojawa
9bd6f83034 Applies rad_flags to a lot of common items + bluespace bags 
Also applies fireproofing to Captain's bag. Eng Sachel /duffle get it too for consistency.
 2019-09-28 03:22:17 -05:00
Poojawa
5876a235c2 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-22 00:22:18 -05:00