shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,334 Commits 5 Branches 0 Tags
ceeab2db394dee1e9b2f10ed8fddb8676607cd88
Commit Graph
838 Commits
Author SHA1 Message Date
Ghommie c9ce5e4efe Unmodularize digi/muzzled clothing sprites. 2019-10-26 17:09:45 +02:00
Anonymous 11ff7802bb Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/mob/suit.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/suits.dmi
 2019-10-26 18:06:56 +03:00
kevinz000andGitHub 49e52eee05 Merge pull request #9603 from Ghommie/Ghommie-cit267 
Unmodularize lavaknights and emags.
 2019-10-25 20:12:35 -07:00
Linzolle 5bafab9447 missing period 2019-10-25 16:34:32 -05:00
MMMiraclesandLinzolle 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
Ghommie cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
Anonymous dcb4c6ae04 Merge branch 'master' into assu 
...and its still coming together...
 2019-10-25 10:31:07 +03:00
kevinz000andGitHub da502aa31d Merge pull request #9535 from Ghommie/Ghommie-cit247 
Fixing sniper rifles scope datum action oddity.
 2019-10-24 19:05:25 -07:00
kevinz000andGitHub 2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie f035d77b53 Slips. 2019-10-24 22:50:53 +02:00
Ghommie f01b5c853f Unmodularize lavaknights. 2019-10-24 22:08:36 +02:00
Linzolle 507e9b7aa0 kinda a dumb workaround 2019-10-24 13:57:00 -05:00
Linzolle deaf1a0e00 guess tahts what ghom meant 2019-10-24 12:14:22 -05: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 4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
Linzolle 8f78bfeb26 oops 2019-10-23 21:36:47 -05:00
Ghommie a95b13c24a jetpack fixes too & co 2019-10-23 19:31:54 +02:00
Ghommie 687d452d67 #44222, yea sorry for your rework Poojawa. 2019-10-23 16:15:26 +02:00
Ghommie e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
Anonymous 29f89ac3a9 Merge branch 'master' into assu 2019-10-23 13:32:39 +03:00
Ghommie b2035c5d6e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 2019-10-22 09:18:30 +02:00
Ghommie ee0c436651 legs 2019-10-22 09:17:37 +02:00
PoojawaandGitHub 7463bbc001 Merge branch 'master' into syntheticbloods 2019-10-21 21:06:18 -05:00
deathride58andGitHub 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 ca1e4b6e65 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit235 2019-10-20 07:29:32 +02:00
Ghommie 8cd93f2085 bad. 2019-10-20 07:28:04 +02:00
Ghommie e991328087 progress 2019-10-19 15:02:56 +02:00
Ghommie 69f27e19fe Touching up job outfits equip procs, little PDA fix. 2019-10-18 18:02:24 +02:00
Poojawa ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
Linzolle 1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
Poojawa 184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
kevinz000andGitHub 7187da9e72 Merge pull request #9456 from Thalpy/Spookytime 
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
 2019-10-15 23:11:35 -07: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
Poojawa bcb11a471d Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-13 19:14:16 -05:00
kevinz000andGitHub adeb33cdae Merge pull request #9463 from Owai-Seek/minor-fixes 
Updating Kinkmate item-list
 2019-10-13 13:54:26 -07:00
Poojawa 394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000andGitHub 620af601b2 Merge pull request #9437 from JTGSZ/clothingrestrictions 
Optional Species based clothing restrictions
 2019-10-11 12:08:57 -07:00
Winter Flare 2bce423ec3 Added a -ton- of stuff to the Kinkmate 2019-10-10 14:08:14 -04:00
kevinz000andGitHub d9ff4235eb Merge pull request #9447 from Ghommie/Ghommie-cit223 
No digitigrade plasmaman suits sprites for the time being, thank you.
 2019-10-10 02:20:45 -07:00
kevinz000andGitHub fda64df569 Merge pull request #9257 from Thalpy/Blind-quirk-without-anger 
[READY] Blind quirk without anger
 2019-10-10 02:19:17 -07:00
kevinz000andGitHub 0c9a065096 Merge pull request #8401 from Ghommie/Ghommie-cit11 
Refactoring Implants' loc n°3
 2019-10-10 02:09:37 -07:00
Ghommie c4a8b80851 No digitigrade plasmaman suits spriting, thank you. 2019-10-08 18:43:40 +02:00
Poojawa 3113074bfb Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-08 02:55:32 -05:00