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

2463 Commits

Author SHA1 Message Date
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
kevinz000
82c8710267 Merge pull request #11700 from kiwedespars/papermask 
adds new cosmetic and craftable paper masks.
 2020-04-01 01:03:14 -07:00
kevinz000
b5f1cbd3d0 Merge pull request #11683 from timothyteakettle/wrestling_holodeck 
holodeck WRESTLING
 2020-03-31 18:03:00 -07:00
Putnam3145
658701bf37 Various ghost role QoL; moving holding facility; removing energy net (#11676) 
* Removed gay baby jail net from ninja

* Made a proper holding facility for syndicate contractors

* Made ghost role eligibility able to allow reghosting.

* Added a medibot to the holding facility.

* Added new comsigs to every other ghost proc

* Properly dummied out capture objective
 2020-03-31 22:04:55 +02:00
kiwedespars
d825a10e58 makes the mask craftable 2020-03-31 01:51:14 -07:00
timothyteakettle
e2d02beedf refactors the code to be less awful 
i was told my code was bad so maybe its less bad now
 2020-03-31 00:20:44 +01:00
Timothy Teakettle
c6163e2349 this time it will work, right? 2020-03-29 15:02:36 +01:00
Timothy Teakettle
a68ce82060 woops 2020-03-29 14:13:16 +01:00
kevinz000
4eb2fb531a Update sword_point.dm (#11678) 2020-03-29 15:03:08 +02:00
Trilbyspaceclone
942034df51 Makes a few space ruins hard spawn (#11606) 
* Update space.dm

* off with the sawed-in-half ruin

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-29 03:53:31 +02:00
timothyteakettle
b89a6b0398 makes everything work 2020-03-29 02:44:44 +01:00
timothyteakettle
5afe5aab3f fixes the map, adds subtype of martial art 2020-03-29 00:46:18 +00:00
kevinz000
6cafca3f9f Merge pull request #11652 from Ghommie/Ghommie-cit650 
Ports "Makes raw HTML and browser datum popups UTF-8 aware"
 2020-03-28 16:00:48 -07:00
kevinz000
cf24117c77 Merge pull request #11639 from Citadel-Station-13/Ghommie-patch-1 
Makes Envy knife amongst other dna disguise shenanigeans actually update the gender.
 2020-03-28 15:58:29 -07:00
Ghom
09608dee5f Update split_personality.dm 2020-03-28 03:30:36 +01:00
kevinz000
06bc8073cb Merge pull request #11614 from Citadel-Station-13/Ghommie-patch-2 
Quick webedit fixing an issue with the split personality.
 2020-03-27 16:32:29 -07:00
Ghommie
41e2c60d4a Ports "Makes raw HTML and browser datum popups UTF-8 aware" 2020-03-27 22:52:43 +01:00
Putnam3145
1a6107a518 Removed nymphomania, plus code cleanup (#11641) 2020-03-27 14:03:05 +01:00
kevinz000
0c60294c0f does the quirky thing where a beam with origin/target in a container doesn't cut the map in half because byond is quirky and things inside things are x/y/z=0 (#11585) 
* Update beam.dm

* god i hate this

* Update beam.dm

* ok

* touching kevinz PR in an inappropriate way.

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-27 00:21:10 +01:00
Lin
76e4d0e0db Merge pull request #11622 from Ghommie/Ghommie-cit643 
Antags such as wizard and nuke ops are now flavorless. Also closet megafauna fix.
 2020-03-26 18:06:50 -05:00
Ghom
1eb25e4880 Update dna.dm 2020-03-26 23:56:01 +01:00
Ghommie
1642903ab3 Spares the official because they don't have their name replaced. 2020-03-25 23:46:27 +01:00
Ghommie
4a01e59623 Signals things. 2020-03-25 23:36:31 +01:00
Ghommie
36d5d5e141 Antagonists such as wizard and nuke ops are now more anonymous. 2020-03-25 23:33:50 +01:00
kevinz000
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
kevinz000
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
kevinz000
d2e98679f4 Merge pull request #11598 from Ghommie/Ghommie-cit640 
Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode.
 2020-03-25 12:19:37 -07:00
kevinz000
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
Ghom
91aad127dd Quick webedit fixing an issue with the split personality. 2020-03-25 13:54:41 +01:00
necromanceranne
5341bdf008 BOXERS CAN ONLY KNOCK OUT OTHER BOXERS 2020-03-25 09:08:15 +11:00
Ghommie
a2b2e08e31 Fixes crafting hud icon overlapping the second pocket on 1:1 screen mode. 2020-03-24 17:53:53 +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
kevinz000
ddd00b1981 Merge pull request #11572 from DeltaFire15/clockies-vanguardstam 
Clockie Vanguard Spell - rebalance for stamcombat
 2020-03-23 10:37:42 -07:00
kevinz000
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
57429493c6 Merge pull request #11581 from Ghommie/Ghommie-cit637 
M/F body preferences.
 2020-03-23 10:34:02 -07:00
keronshb
830f646383 Revert "Merge pull request #11225 from r4d6/Random-Mining" 
This reverts commit ea5774e713.
 2020-03-22 15:55:08 -04: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
Putnam3145
368d47aa69 Adds ghost role eligibility to various ghost roles. (#11549) 
* Added ghost role eligibility to CTF, possession, random animal

* Also added possessed blade to it.

* Also removed some extraneous dead/observer things.

* ahaha whoops
 2020-03-22 13:02:23 +01:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
DeltaFire
513c499dec Vanguard: 30 stamregen / second, 50% stamlossfeedback 
Modifies vanguard to actually fit into a combat system with stamina, since it didn't have any real thing for stamregen despite explicitly stating it caused increased stamregen. Incredible.
 2020-03-22 00:44:59 +01:00
DeltaFire
277af2a7bf Vanguard heals stam too now 
2 stam per tick = 10 stam per second, going to add a tradeoff simillar to the stun absorb one too probably
 2020-03-21 17:14:22 +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
Seris02
332099953b removes xray from the gene pool 2020-03-20 11:15:47 +08:00
kevinz000
6e84781670 tasers are now as fast as disablers and 7 --> 14 tile range but do not have impact damage (#11351) 
* Update stun.dm

* Update stun.dm

* Update stun.dm

* Update debuffs.dm
 2020-03-20 03:15:03 +01:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
kevinz000
7d46ed2bec Merge pull request #11282 from Ghommie/Ghommie-cit595 
Yeets the preferences_vore datum and migrates its stuff to preferences.
 2020-03-19 08:30:18 -07:00
Ghommie
32975bf509 More bug reports yee'd their last haw. 2020-03-18 23:43:23 +01:00
nik707
9b71b1a9a2 Merge pull request #11511 from EmeraldSundisk/cogshuttles 
Let's just start with the shuttles.
 2020-03-18 14:37:27 -05:00
kevinz000
6758761a65 Update action.dm (#11521) 2020-03-18 19:44:33 +01:00