shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
48,445 Commits 5 Branches 0 Tags
master
Commit Graph

96 Commits

Author SHA1 Message Date
zerothebigboy c99b22fe32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into sabre 
# Conflicts:
#	icons/obj/items_and_weapons.dmi
 2023-01-29 21:59:01 -05:00
zerothebigboy 4f034eadc1 yep 2023-01-26 05:54:51 -05:00
zerothebigboy 2cfa2c34a6 yep 2023-01-26 04:11:41 -05:00
zerothebigboy 4e0498573f thefartdomeengages 2022-08-13 18:16:37 -04:00
zerothebigboy 1bc3796b06 watchmegetgitbanned 2022-08-11 19:17:16 -04:00
keronshb 3cfea7eb92 Ball2021 2021-10-16 00:02:05 -04:00
zerothebigboy c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
zerothebigboy 94c6fd5bbc hammers 2021-09-02 03:26:09 -04:00
zerothebigboy fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04:00
zerothebigboy a64d94a7cc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:25:35 -04:00
zerothebigboy bae89fcaba Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into beltsprites 2021-06-13 18:19:01 -04:00
zerothebigboy 319e03476b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into miscsprites 2021-06-13 18:16:08 -04:00
zerothebigboy e757f9ea2c thetwentythirdofmany 2021-06-12 17:41:09 -04:00
zerothebigboy 1122135c17 thetwentiethofmany 2021-06-11 20:04:05 -04:00
zerothebigboy 53e95b7356 theseventeenthofmany 2021-06-11 19:48:04 -04:00
zerothebigboy 8a5a5ef6cc thethirteenthofmany 2021-06-11 19:22:05 -04:00
zerothebigboy 190edf57e8 painful 2021-06-09 18:28:21 -04:00
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
 2021-05-02 22:47:39 -04:00
keronshb 475a7d2499 Icon fixes 
Should fix the merge conflict
 2021-04-14 18:01:17 -04:00
Eric fe71135d7a Add files via upload 
Updates item icons for Telescopic Bat
 2021-03-28 22:38:53 -05:00
zerothebigboy d43c7c00f6 conflicts and stealth nerf 2021-02-13 13:51:03 -05:00
zerothebigboy 7d60d27a6f fun 2021-02-09 17:31:24 -05:00
Hatterhat 4525b1b64f ooOOooOO today i wont test my code again 2021-01-29 20:19:58 -06:00
zerothebigboy e7d8021b81 a 2021-01-27 18:46:11 -05:00
necromanceranne 0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. 2021-01-04 15:30:28 +11:00
necromanceranne 6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites 2021-01-02 04:26:39 +11:00
necromanceranne 0aa5338f9b Adds wakibokken, puts bokken crafting into the craft menu, makes proper bokken a little harder to make but obviously an upgrade, makes crafted katanas and bokken have actual belt overlays 2021-01-01 05:42:28 +11:00
Hatterhat 96e55d6233 the last bit 2020-10-07 17:50:21 -05:00
Hatterhat 9928a172d0 initial commit - sabres 2020-10-06 21:58:59 -05:00
zerothebigboy 5df58b3ca6 a 2020-08-21 02:24:43 -04:00
zerothebigboy cafeb6ab14 a 2020-08-21 02:12:09 -04:00
zerothebigboy 6fb537e712 a 2020-08-21 02:12:01 -04:00
zerothebigboy 421e32f3f9 a final touch up 2020-08-21 02:06:36 -04:00
zerothebigboy b960f4055d a 2020-08-21 01:31:30 -04:00
necromanceranne e9cee24608 Updates the stunbaton sprites 2020-07-28 02:01:10 +10:00
Hatterhat 14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
Ghommie 9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
b1tt3r1n0 a780b9037c Some edits to pouches, and something that can hold sheets. 
Title. Vendor edits and a minor engineering addition for those who want to hold sheets and shit.
 2020-06-24 23:07:56 -04:00
Ghommie de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00
b1tt3r1n0 764ba26ace Pouches (#12432) 
* The Ammo Pouch

It holds magazines and most forms of ammo.

* The Ammo Pouch

It holds magazines and most forms of ammo.
 2020-06-09 03:22:39 -07:00
Ghommie 1bca74465f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-05-30 03:29:02 +02:00
Ghom ab5d65a454 Porting the BEPIS research machinery. (#12277) 
* Initial B.E.P.I.S port.

* All nodes but sticky tape are in. Sweet.

* Mapping the BEPIS :DDD

* ah

* deers.
 2020-05-24 13:05:15 -07:00
Ghommie 30ab79e09e Porting the twohanded component. 2020-05-17 18:16:53 +02:00
Ghommie 7fb96ab0cf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-05-12 20:06:59 +02:00
Ghommie aaa31c24ce Demodularizing a few sprite assets. 2020-05-08 04:02:31 +02:00
Ghommie c93f028a97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit685 2020-04-21 01:53:41 +02:00
Ghommie 4c6f1b622b Porting Goofconomy & co. 2020-04-17 07:48:11 +02:00
TrilbySpaceClone 8fed6552cd last fixes 2020-04-14 22:44:47 -04:00
TrilbySpaceClone 4419dc13f5 changes and additons 2020-04-14 22:17:53 -04:00
Artur e23bacdf6b Icons 2020-04-01 13:03:31 +03:00