shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,654 Commits 5 Branches 0 Tags
8132db65b1c596815432776ffb85d82afafc7708
Commit Graph
1980 Commits
Author SHA1 Message Date
kevinz000 234687c5c8 do_after_advanced 2020-04-11 05:10:07 -07:00
kevinz000 3c4c397c46 Merge remote-tracking branch 'citadel/master' into combat_rework 2020-04-08 04:04:45 -07:00
LinandGitHub 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
kevinz000andGitHub 699f891166 Merge pull request #11750 from Putnam3145/pluoxium 
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
 2020-04-06 15:46:09 -07:00
Putnam 31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
kevinz000andGitHub 956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
kevinz000andGitHub 886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665 
Dwarfy message spam QoL.
 2020-04-04 07:11:02 -07:00
kevinz000andGitHub 413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
Ghommie 9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
GhomandGitHub a9ea7be699 Update dwarves.dm 2020-04-03 18:21:38 +02:00
necromanceranneandGitHub c5b55826b5 Punches land with the same consistency across races, punches cheaper, king hits are nastier (#11707) 
* I think everyone should be landing punches now.

* brawling just got mathematical?

* pawnch harder get tired less this is a balance change now I guess

* nearly added instastun king hits, now stun punches are more rng

* I'm tired okay
 2020-04-03 14:19:40 +02:00
GhomandGitHub 37b6aa9897 Update dwarves.dm 2020-04-03 05:31:37 +02:00
Ghommie 4ef42ba6b1 Dwarfy message spam QoL. 2020-04-03 05:16:17 +02:00
kevinz000andGitHub 2521aa4973 Merge pull request #11677 from actioninja/wooow-glow 
Better glowing lights
 2020-03-30 14:50:36 -07:00
kevinz000GitHubGhom
 		6e140f003c cloners now give TRAIT_MUTATION_STASIS and prevent active genes from ticking while inside (#11691) 
* Update cloning.dm

* Update traits.dm

* Update life.dm

* Update code/__DEFINES/traits.dm

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

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-30 23:24:51 +02:00
actioninja f419653c28 functionality 2020-03-28 23:50:06 -07:00
Putnam3145andGitHub b5c4124d7a Merge pull request #11638 from Ghommie/Ghommie-cit646 
Moderately unoriginal PR title about runtime errors.
 2020-03-27 17:12:49 -07:00
LinandGitHub d907a4948b Merge pull request #11615 from Citadel-Station-13/Ghommie-patch-3 
Fixing creamed snout overlay a second time.
 2020-03-26 17:57:50 -05:00
Ghommie 3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
kevinz000andGitHub b32e6c3b5b Merge pull request #11607 from Ghommie/Ghommie-cit642 
Adds privates visibility preferences. Also underwear now fulfills its purpose.
 2020-03-26 13:24:26 -07:00
kevinz000andGitHub 3eca22350a Merge pull request #11608 from Citadel-Station-13/Ghommie-patch-1 
Fixes cold movespeed slowdown affecting floating mobs (no gravity).
 2020-03-26 13:24:06 -07:00
kevinz000 4391fc3714 pixel shifting 2020-03-26 12:51:17 -07:00
kevinz000 92b809634b k 2020-03-26 11:32:18 -07:00
kevinz000 825adfa29f whew 2020-03-25 21:23:54 -07:00
kevinz000andGitHub 0f4444b567 Nerfs piggyback and fireman carrying (#11555) 
* ok

* daze duration increased, MOBILITY_USE now has.. a use.

* k

* @ghommie
 2020-03-25 21:16:35 +01:00
kevinz000andGitHub 4d43f2bdf9 Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS 
PUNCHING: YOU SHOULD BE SCREAMING EDITION
 2020-03-25 12:23:08 -07:00
kevinz000andGitHub 46e3267d4c Merge pull request #11557 from Ghommie/Ghommie-cit632 
Removes species default_features variable.
 2020-03-25 12:16:40 -07:00
kevinz000GitHubGhom
 		cbb5d52ca1 Melee Stagger (#11443) 
* 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

* wack

* animation is now shorter

* linter save me

* i hate you

* k

* k

* k

* i hate you

* wrong button

* k

* ok

* bet

* bet

* bet

* Update item_attack.dm

* 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

* fix

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-25 18:37:39 +01:00
GhomandGitHub e4550efb39 Fixing creamed snout overlay a second time. 2020-03-25 17:45:11 +01:00
monster860andGitHub 927852a93a Make the no-ass-slap message actually display (#11612) 2020-03-25 12:56:57 +01:00
Ghommie c6b4b5f686 lazy fix before I go to sleep. 2020-03-25 05:17:09 +01:00
GhomandGitHub edfc77fc2a Fixes cold movespeed slowdown affecting floating mobs (no gravity). 2020-03-25 04:18:01 +01:00
Ghommie c9f02d97a1 Privates Visibility Preferences. Also Undergarments having a purpose. 2020-03-25 02:47:16 +01:00
necromanceranne 3c548a3819 YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS 2020-03-25 08:33:23 +11:00
kevinz000 bf0970d8c3 Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-23 15:34:04 -07:00
Ghommie d336bcf259 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632 2020-03-23 21:02:47 +01: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
kevinz000andGitHub 3990b1f4c9 Merge pull request #11571 from Ghommie/Ghommie-cit635 
Size preferences made configurable.
 2020-03-23 10:37:54 -07:00
kevinz000andGitHub dfec544d71 Merge pull request #11578 from Ghommie/Ghommie-cit636 
Fixing owner not being set in mutation/on_aquiring.
 2020-03-23 10:36:17 -07:00
kevinz000 a6ca854e5c Merge remote-tracking branch 'citadel/master' into shield_refactor 2020-03-22 15:07:41 -07:00
Ghommie c798b31d6f bodyparts cache aaaaa. 2020-03-22 22:20:26 +01:00
Ghommie 76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie 3c2cb76792 Fixing owner not being set in mutation/on_aquiring. 2020-03-22 15:23:05 +01:00
Ghommie 86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Ghommie 6d4433dd77 Size preferences made configurable. 2020-03-22 01:07:51 +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
kevinz000andGitHub c7e634b8c8 Merge pull request #11565 from Citadel-Station-13/Ghommie-patch-1 
Fixing permanent slapstick comedy creamed overlay.
 2020-03-21 10:30:12 -07: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
GhomandGitHub cf4f7a705d Update human.dm 2020-03-21 14:52:16 +01:00