shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,568 Commits 5 Branches 0 Tags
08f251a88c898ce3a635909512303170483694de
Commit Graph

3652 Commits

Author SHA1 Message Date
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
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
Lin
e8c33c411f Merge pull request #11723 from Ghommie/Ghommie-cit663 
Fixing three runtime errors.
 2020-04-04 02:53:18 +00: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
Ghommie
9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +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
Ghommie
1c81c8676b Stops alopecia. 2020-04-03 00:33:38 +02:00
Ghommie
5a63eba57a Stops a monky trick with mob holders. 2020-04-03 00:23:58 +02:00
Ghommie
58bc10bd31 Fixing three runtime errors. 2020-04-02 23:33:40 +02: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
Ghommie
519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Artur
881f8765f4 Stufffs 2020-04-01 15:29:40 +03:00
Artur
65ec9f3723 Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again 2020-04-01 13:03:06 +03:00
Artur
f40f07b033 [READY]Skateboard overhaul (#45657) 
* skeet skeet

* scoot

* removes debug message

* merge conflict

* oopsie

* polish, new board types

* begone

* actioninja review

* passtable trait

* fixes indent

* dwarfism check

* check for existing flag

* check existing trait

* screwdriver returns FALSE
 2020-04-01 12:05:27 +03: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
Artur
a903752ff9 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-31 19:42:35 +03: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
Ghommie
c3faf94d8f WIP 2020-03-30 05:29:39 +02:00
Ghommie
5e5bc2a690 force push. 2020-03-29 17:01:05 +02: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
kevinz000
8fe064da74 save memory.. 2020-03-26 14:13:18 -07:00
kevinz000
135ca27281 parry 2020-03-26 13:08:05 -07: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
Artur
6e22438fb5 Whoopsie~ Forgot to rename the recipy 2020-03-25 19:39:19 +02: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
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00