shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
34,962 Commits 5 Branches 0 Tags
cdebccf38fde1afeb384ecbf002193561fa4a982
Commit Graph
1242 Commits
Author SHA1 Message Date
Ghommie 56669f9296 Minor snowflakes clothing variations refactor. Removal of copypasted states. 2020-04-04 00:22:18 +02:00
necromanceranne 0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Artur 7da4ad5694 Damned title doesnt want to show up 2020-04-03 10:29:07 +03:00
Ghommie 45d1917f0f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655 2020-04-02 16:07:13 +02:00
kiwedesparsandGitHub 83abe07cb7 cobbling together the actual item 2020-03-31 01:49:29 -07:00
Ghommie 2bf6d888bd Ports "Obliterates item_color: new washing machine functionality edition" 2020-03-30 18:31:26 +02:00
Ghommie c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
kevinz000andGitHub 6464c2470a Merge pull request #11600 from Ghommie/Ghommie-cit641 
Removes dead flightsuit code leftovers and bad hook.
 2020-03-25 12:20:17 -07:00
zeroisthebiggayandGitHub 82396c33cf i made an oops (#11591) 2020-03-24 20:34:01 +01:00
Ghommie 54cdae148d Removes uncompiled flightsuit code leftovers and bad hooks. 2020-03-24 20:28:13 +01:00
kevinz000 bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
kevinz000andGitHub ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
zeroisthebiggayandGitHub f5a96241ab sneaksuits are not fireproof (#11573) 
* and i wanna die

* i decide to revert

* a a a a
 2020-03-23 15:47:41 +01:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie 2045fb86f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-21 21:41:34 +01:00
kevinz000 300c8e3c6d Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-21 09:53:39 -07:00
kevinz000GitHubGhom
 		0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
necromanceranneandGitHub 94c700a06c NVG Nerf/Syndicate NVG Buff (#11548) 
* nerfs the shit out of nvg and gives syndicate special flashproof versions

* forgot about this one

* bleh
 2020-03-21 15:31:59 +01:00
kevinz000 6754b794b1 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-20 22:59:17 -07:00
ZeroMan bc5e850516 i still feel pain 2020-03-20 13:35:55 -04:00
ZeroMan 96d897a0fb i hurt myself today 2020-03-20 13:33:07 -04:00
ZeroMan 35a4d71a54 im sorry little one 2020-03-19 21:59:14 -04:00
Detective Google 6b392e09c2 Merge remote-tracking branch 'upstream/master' into hudpatches 2020-03-17 16:29:13 -05:00
Detective Google af872d1476 push 2020-03-17 16:10:15 -05:00
kevinz000 7a25e04324 bet 2020-03-16 11:15:11 -07:00
kevinz000 7fdbcc55c6 s 2020-03-16 11:12:10 -07:00
kevinz000 d3724d5fbd f 2020-03-16 10:59:34 -07:00
kevinz000 e3301f8722 bet 2020-03-16 10:44:02 -07:00
necromanceranne 19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11:00
kevinz000 6af9c54da5 better 2020-03-16 04:59:55 -07:00
kevinz000 a77be038b8 refactoring this whole thing again 2020-03-16 04:56:32 -07:00
kevinz000 2a9e4bebdd priority 2020-03-16 04:24:18 -07:00
kevinz000 69374c64c9 k 2020-03-16 04:18:22 -07:00
kevinz000 857f793600 ok 2020-03-16 04:12:54 -07:00
kevinz000 644273beca k 2020-03-16 04:09:25 -07:00
Detective Google 828b5cdacf why was this backwards 2020-03-16 01:57:23 -05:00
Detective Google 94f694e568 adds some hudpatches 
seemed like fun flavor, inspired by bay and a request.
 2020-03-16 01:44:26 -05:00
Ghommie 312ef1d961 Merge branch 'Ghommie-cit616' of https://github.com/Ghommie/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:38:42 +01:00
Ghommie ea30b2fb1a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616 2020-03-15 22:35:59 +01:00
kevinz000andGitHub 7a27baa699 Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu 
ports ([READY] Allows bandannas to be worn as neckerchiefs. #40125) from TG code
 2020-03-14 09:12:12 -07:00
Seris02 48076c921d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atomwalkers 2020-03-14 11:41:39 +08:00
ZeroMan 3fa39fd7ab i hate my ocd 2020-03-12 20:57:41 -04:00
ZeroMan f5ec7f5b65 it works it works 2020-03-12 20:47:35 -04:00
Putnam3145andGitHub 480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
GhomandGitHub bba13d706d FAAAAKE 2020-03-12 00:16:42 +01:00
Ghommie d31075eb54 Spellcasting element 2020-03-11 16:23:30 +01:00
Ghommie 27a7f754c4 Fix runtimes some more. 2020-03-10 22:40:06 +01:00
Ghommie 2b4b626fac support for items that switch states through update_icon. 2020-03-10 16:55:30 +01:00
kevinz000andGitHub e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00