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

1079 Commits

Author SHA1 Message Date
necromanceranne
a6bd6d23fe Some cleanup with help from rohesie, hopefully I figured it out 2020-04-06 12:28:14 +10: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
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
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
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
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
necromanceranne
19fd006103 Fixed some missing sprites 2020-03-17 02:12:28 +11: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
kevinz000
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
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
Putnam3145
480eb32c68 Merge pull request #11418 from Ghommie/Ghommie-cit615 
Fix runtimes some more.
 2020-03-11 17:01:13 -07:00
Ghom
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
kevinz000
e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000
d3306e2eec Merge pull request #11392 from zeroisthebiggay/hardsuithelmetsarenice 
syndicate elite hardsuit helmet doesnt hide masks anymore
 2020-03-10 05:57:27 -07:00
kevinz000
bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 
Ports "Switches out the three billion args of electrocute act for flags"
 2020-03-10 05:56:28 -07:00
kevinz000
aca1d70bbb Merge pull request #11397 from zeroisthebiggay/helmetsarenotheavy 
syndicate contractor helmets are no longer secretly lead
 2020-03-10 05:56:08 -07:00
kevinz000
bd2aa5f54b Merge pull request #11402 from Ghommie/Ghommie-cit614 
Porting more legcuffs / bola fixes etcetera
 2020-03-09 21:01:51 -07:00
Ghom
503827a0b6 Merge pull request #11382 from zeroisthebiggay/snowflakesyndicatecontractorshit 
tauric contractor space suits
 2020-03-09 16:50:32 +01:00
Ghommie
4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
ZeroMan
c079dba753 its a fucking helmet 2020-03-08 23:07:24 -04:00
Ghommie
ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghom
1cd9c19b4c Merge pull request #11288 from Trilbyspaceclone/patch-300 
[ready] Craftable Prescription & Sunglasses HUDs
 2020-03-09 00:01:12 +01:00