shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph

1101 Commits

Author SHA1 Message Date
kevinz000
7cb2057bb0 Merge pull request #11751 from Arturlang/kills_the_shitty_fix 
TGUI Next vendors plus spritesheet port from TG
 2020-04-09 03:53:08 -07:00
kevinz000
956a85ab34 Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening 
Punch Changes 2: The Quickening
 2020-04-09 02:09:51 -07:00
Lin
8379169b81 Merge pull request #11476 from kevinz000/shield_refactor 
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
 2020-04-07 20:47:15 +00:00
necromanceranne
b494aa3370 Fixed up how the proc is used, made northstar gloves give you no_softcrit instead of no_hardcrit, you altclick to change the warcry since they're no_drop now 2020-04-07 17:51:25 +10:00
Trilbyspaceclone
faf199fc35 Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking (#11747) 
* Update security.dm

* Update civilian_service.dm

* why is their so many more lines of the same code here?

* Update rnd.dm

* clears up sec file so that they all use a base

* Update curator.dm
 2020-04-06 17:53:43 +02:00
Artur
c402c6dc30 Combinig https://github.com/Citadel-Station-13/Citadel-Station-13/pull/11122/ 2020-04-06 13:24:52 +03:00
necromanceranne
1c50192c12 further fixing stuff 2020-04-06 13:42:23 +10:00
necromanceranne
a6bd6d23fe Some cleanup with help from rohesie, hopefully I figured it out 2020-04-06 12:28:14 +10:00
Artur
f26f0c2555 Merge remote-tracking branch 'Citadel-Station-13/master' into kills_the_shitty_fix 2020-04-05 18:21:50 +03:00
necromanceranne
38586c9d92 I feel like this is more fitting 2020-04-04 20:09:09 +11:00
necromanceranne
4c051f70e8 fixes this too 2020-04-04 19:16:59 +11:00
necromanceranne
bd5446e906 NYOOPS 2020-04-04 18:21:18 +11:00
necromanceranne
fcb816675b not only am I blind I am also dumb 2020-04-04 18:20:17 +11:00
necromanceranne
7935eb8364 pretty sure this was brekaing stuff 2020-04-04 17:24:44 +11:00
necromanceranne
c6e82382a3 I feel like messing with this is basically unnecessary 2020-04-04 16:51:32 +11:00
necromanceranne
8af29a178c Hooks up the chaplain null rod gloves to the choice of gloves 2020-04-04 16:42:37 +11:00
necromanceranne
71e19aead2 ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye 2020-04-04 16:29:29 +11:00
necromanceranne
923486eb43 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-04 13:40:34 +11:00
kevinz000
413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07: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
kiwedespars
83abe07cb7 cobbling together the actual item 2020-03-31 01:49:29 -07:00
Ghommie
f7ce5e5de3 infiltrator sneaky shoes fix. 2020-03-27 14:42:23 +01:00
kevinz000
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
zeroisthebiggay
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
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
zeroisthebiggay
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
kevinz000
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
necromanceranne
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