shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

614 Commits

Author SHA1 Message Date
nik707
c826e1b412 Merge pull request #9175 from lolman360/master 
[READY] Adds durathread jumpskirts, rolled down jumpsuits and PROBABLY FIXES SPRITES
 2019-08-31 02:06:33 -05:00
nik707
4f9b901a97 Merge pull request #9158 from Citadel-Station-13/kevinz000-patch-73 
Rebalances the MASONrig
 2019-08-29 19:06:04 -05:00
nik707
9a0b6a21f9 Merge pull request #8904 from Citadel-Station-13/kevinz000-patch-64 
Amber alert ERTs no longer get pulse weapons
 2019-08-28 13:05:56 -05:00
nik707
8e40e9d887 Merge pull request #9186 from Sishen1542/walklikeanegyptian 
spellcheck of pharaoh gear, added pharaoh gear to chappy vendor p2
 2019-08-28 00:02:39 -05:00
Ghommie
24fe7126c4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-08-24 19:05:51 +02:00
Sishen
3f86a92efa Merge branch 'walk-like-an-egyptian' into walklikeanegyptian 2019-08-23 14:42:35 -04:00
lolman360
c618ce114d Ebb 2019-08-22 14:18:49 +10:00
Sishen
ed2c3f3cbd Fixes spelling mistakes, adds pharaoh gear to chaplain vendor 2019-08-19 13:53:05 -04:00
kevinz000
86cb735cc9 Merge branch 'master' into kevinz000-patch-64 2019-08-18 23:41:40 -07:00
kevinz000
47dd8d22eb Merge pull request #9149 from Trilbyspaceclone/padding_and_such 
Adds Tatical armor to IAA/Synda uplinks as well as some armor accessorys
 2019-08-18 23:37:56 -07:00
kevinz000
3ef29bbbeb Merge pull request #9097 from lolman360/durathread 
Adds durathread.
 2019-08-18 23:37:07 -07:00
kevinz000
8a96b29ef9 Merge pull request #9137 from Sishen1542/the-d-boiz 
addition of the "assistant response team" a pack of assistants sent in from CComm
 2019-08-18 23:34:49 -07:00
kevinz000
17a522300c Update hardsuit.dm 2019-08-18 20:05:42 -07:00
kevinz000
2c000636dd Update hardsuit.dm 2019-08-18 07:24:58 -07:00
TrilbySpaceClone
2b08b97f1d yay 2019-08-17 23:54:50 -04:00
TrilbySpaceClone
e69d27f9eb Traitor armor 2019-08-17 20:36:47 -04:00
lolman360
e838da8039 Merge pull request #3 from Citadel-Station-13/master 
3
 2019-08-17 11:55:56 +10:00
kevinz000
cf55151f04 Merge pull request #9131 from jakeramsay007/Runtime-Fixes 
Prevents runtime spam from Hugs of the North Star
 2019-08-16 16:59:11 -07:00
Sishen
542915faa6 Update ert.dm 2019-08-16 10:53:24 -04:00
Sishen
26de2b8111 greybois 2019-08-16 10:49:26 -04:00
deathride58
5a4d0a73ce Merge pull request #9038 from Citadel-Station-13/kevinz000-patch-67 
Fixes/tweaks jump boots
 2019-08-14 15:00:36 -04:00
Chayse Ramsay
97c3b2eda7 Prevents runtime spam from Hugs of the North Star 
Also fixes an unintended oversight of the Gloves of the North Star, with them causing the warcry upon picking up any item or clicking on any item in harm intent.
 2019-08-14 18:29:35 +01:00
kevinz000
a971390cff Merge pull request #8992 from jakeramsay007/Helmet-Internals 
[READY] Hardsuit helmets can now be used as internals masks. Rejoice, CE mains.
 2019-08-11 10:15:49 -07:00
lolman360
0451390778 control click and then drag is easy 2019-08-11 11:16:19 +10:00
Cebutris
d0b8e054fd Added hug gloves as their own item, removing the feature from regular GotNS 2019-08-06 16:42:35 -04:00
Cebutris
564aa9b4cb Gloves of the north star now work for hugging and patting 2019-08-06 13:01:49 -04:00
kevinz000
1c1ca84c3a Update miscellaneous.dm 2019-08-03 00:49:57 -07:00
kevinz000
d5b0104a3e Update miscellaneous.dm 2019-08-02 05:46:49 -07:00
Ghommie
438c3253d0 Taur snowflake code makes me sick. 2019-07-31 22:01:05 +02:00
Ghommie
7c9c51b777 Ports "Adds techpriest robes and adds them to the RoboDrobe" 2019-07-31 21:54:55 +02:00
Chayse Ramsay
5055cd73b9 Hardsuit Helmets can now be used as internals masks. Rejoice, CE mains. 
Also reworks internals code a little to be much more friendly. Any head or mask item with the flag should now function as an internals mask if it has the ALLOWSINTERNALS flag.
 2019-07-28 17:31:59 +01:00
Sishen
68083aa0c6 a 2019-07-25 21:43:02 -04:00
Sishen
a4529491ea Update color.dm 2019-07-25 21:43:02 -04:00
Sishen
1a92134ad3 b 2019-07-25 21:43:02 -04:00
Sishen
612021b9d5 h 2019-07-25 21:43:02 -04:00
Ghommie
e8584720b3 Fixes suit worn overlay for towels. 2019-07-21 11:18:38 +02:00
deathride58
2970ee54a9 fix ur code catman 2019-07-17 18:05:34 -04:00
Ghommie
589cdae0e1 Towels 2019-07-18 00:03:49 +02:00
kevinz000
9995876a59 Update ert.dm 2019-07-15 17:00:31 -07:00
Ghommie
1e1f8e627f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit28 2019-07-15 17:33:41 +02:00
kevinz000
61bc43a0d7 Merge pull request #8693 from Ghommie/Ghommie-cit70 
Ports "clothes burning only spam You of Your clothes"
 2019-07-14 14:52:29 -07:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000
d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135 
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
 2019-07-14 03:37:36 -07:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02:00
kevinz000
c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84 
Sort of porting "Changes the type pathing of some "random" items"
 2019-07-12 07:43:12 -07:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
kevinz000
aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness 
Makes combat boots look T A C T I C O O L
 2019-07-12 07:33:36 -07:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00