shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,515 Commits 5 Branches 0 Tags
076b6c8699eedc011695de089b1fed13f124300a
Commit Graph

68 Commits

Author SHA1 Message Date
kevinz000
53a9f3ac51 Merge pull request #9036 from Linzolle/invisiclothes 
fixes combat gloves plus having no icon, allows for shoes to have their item_state set to use a differently named icon on mobs
 2019-08-04 19:09:36 -07:00
kevinz000
a82f9c011b Merge pull request #9004 from Trilbyspaceclone/Crafting 
Ports "Adds helpers for finding martial arts types #42045" as well as "Adds simple framework for learnable crafting recipes #43296"
 2019-08-02 00:57:05 -07:00
Linzolle
bc9bca8d04 oh my god 2019-08-02 01:20:32 -05:00
Linzolle
db198ba217 fix leg sweep 2019-07-31 01:17:12 -05:00
TrilbySpaceClone
7ca32cd97f port 2 2019-07-29 07:28:38 -04:00
Ghommie
b6f10c96a7 Modularity was a mistake. 2019-07-16 21:05:12 +02:00
kevinz000
77743c9a0f Merge pull request #8794 from Ghommie/Ghommie-cit100 
Fixes the uplink category indexing.
 2019-07-05 06:56:22 -07:00
Ghommie
595398d76e yea 2019-06-30 17:47:35 +02:00
kevinz000
09c8a45fe2 Merge pull request #8770 from Arturlang/Carp_Deflecting 
Carp now deflects the bullets instead of making them dissapear.
 2019-06-29 20:08:47 -07:00
Arturlang
69a62314e9 Defines so carp reroutes the deflects 2019-06-28 11:37:12 +03:00
kevinz000
1c46bcef7e Merge pull request #8479 from Ghommie/Ghommie-cit21 
Krav maga leg sweep tweak.
 2019-06-16 01:13:08 -07:00
Ghommie
e1c94ef8af named arguments. 2019-06-08 15:06:07 +02:00
Ghommie
ec2da508b8 Gonna go with 25 since it won't be usable on lying people. 2019-06-08 15:05:26 +02:00
kevinz000
ab565d2483 Merge pull request #8547 from Ghommie/Ghommie-cit29 
Moves traits to datums and turn the accessors into defines
 2019-06-08 01:22:16 -07:00
Ghommie
d3d2b8d898 should be ready. 2019-06-06 19:24:20 +02:00
Ghommie
8fbc25ad77 Ports in combat gloves plus. 2019-05-29 16:35:56 +02:00
Ghommie
5309eafb59 Fine and be it, man. 2019-05-29 11:24:27 +02:00
Ghommie
12648720dc tweakin. 2019-05-29 10:41:43 +02:00
Ghommie
fe5ac5e6e9 On the other hand, vehicle memes. 2019-05-29 09:24:12 +02:00
Ghommie
894b0d28e2 Krav maga leg sweep buff. 2019-05-29 08:45:45 +02:00
Poojawa
b6430559e9 datums 2018-09-11 02:49:41 -05:00
deathride58
42083d7206 Removes combat rework training wheels, and nerfs myself by increasing the minimum stamloss required to throw a knockout punch with boxing gloves (#7405) 2018-08-03 19:29:44 -07:00
deathride58
2f9e3e403d Hard upstream sync (#6951) 
* maps - none of our changes included yet i'll get them in after i finish up the rest of the sync

* sync part 1 - underscore folders in code

* controllers folder

* datums folder

* game folder

* cmon, work

* modules - admin to awaymissions

* cargo to events

* fields to lighting

* mapping > ruins

* rest of the code folder

* rest of the folders in the root directory

* DME

* fixes compiling errors. it compiles so it works

* readds map changes

* fixes dogborg module select

* fixes typo in moduleselect_alternate_icon filepath
 2018-05-31 16:03:18 -07:00
LetterJay
5f27ac30c7 Merge branch 'master' into upstream-merge-37582 2018-05-22 07:22:42 -05:00
deathride58
6a07a66cb3 Merge branch 'master' into upstream-merge-37476 2018-05-06 07:07:02 +00:00
ShizCalev
b5a95e9da8 Makes more messages pronoun sensitive 2018-05-03 17:46:25 -05:00
Jordan Brown
db142667b7 Merge pull request #37501 from ShizCalev/icon-fixes 
Fixes missing icons
 2018-04-28 14:54:45 -05:00
oranges
7d45e045a3 Uppercases slot defines. 2018-04-27 20:14:39 -05:00
kevinz000
42d0541a28 fixes cqc working outside chef assigned areas (#37375) 
* cqc

* Update martial.dm

* Update cqc.dm

* Update cqc.dm

* Update human_defense.dm

* Update human_defense.dm

* Update human_defense.dm
 2018-04-24 10:23:34 -05:00
Poojawa
5fa001c10f things with stuff (#6233) 
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
 2018-04-07 23:07:09 -04:00
Armhulen
2d8b007086 Refactors Spell and Martial Art Books to use Action Granters! 2018-03-28 12:18:06 -05:00
CitadelStationBot
b8cc4e2d76 [MIRROR] Fixes Mush Punch (#6102) 
* Fixes Mush Punch (#36631)

* sometimes you just gotta own up to your mistakes :(

* I'm gonna be the best friend you have to ask for yourself to be the most things I can tell 

Real shit

* Fixes Mush Punch
 2018-03-26 04:28:53 -05:00
CitadelStationBot
3d26cd4a6f [MIRROR] Replaced body zone magic strings with defines (#6004) 
* Replaced body zone magic strings with defines

* merge conflicts
 2018-03-19 21:18:57 -05:00
Armhulen
e559fdca2c Mushroom people, revived! 2018-03-07 21:47:42 -06:00
deathride58
2e84b30841 Makes martial arts use Knockdown() instead of Stun() for their stuns (#5617) 2018-02-23 19:19:23 -06:00
Iamgoofball
04ec62d03d Fixes the name on the cook's culinary school training (#35635) 
Totally forgot to do this
 2018-02-15 10:39:44 -06:00
Iamgoofball
5793fe893f The Cook now only works under siege. (#35597) 
The chef's CQC skill now only works in the kitchen area
 2018-02-13 14:18:49 -06:00
ShizCalev
833a700cbb Fixes invalid throwat args (#35565) 2018-02-13 07:14:47 -06:00
Poojawa
03086dfa91 Tg 1 28 sync testing/confirmation (#5178) 
* maps, tgui, tools

* defines and helpers

* onclick and controllers

* datums

fucking caught that hulk reversal too.

* game and shuttle modular

* module/admin

* oh god they fucking moved antag shit again

* haaaaate. Haaaaaaaaaate.

* enables moff wings

* more modules things

* tgstation.dme

before I forget something important

* some mob stuff

* s'more mob/living stuff

* some carbon stuff

* ayy lmaos and kitchen meat

* Human stuff

* species things

moff wings have a 'none' version too

* the rest of the module stuff.

* some strings

* misc

* mob icons

* some other icons.

* It compiles FUCK BORERS

FUCK BORERS
 2018-01-29 04:42:29 -06:00
ThePainkiller
90947a50ad fix/spellcheck: Changes command error on cqc.dm (#34634) 
* Update holy_weapons.dm

* Update cqc.dm
 2018-01-19 08:57:18 -06:00
LetterJay
2e6b034493 save point - a lot of shit to fix 2017-12-27 07:03:40 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
Jordan Brown
164db7ae9b Prefixed all disability defines with DISABILITY_ to fix a name collision 2017-12-24 15:03:30 -06:00
deathride58
b2187123fb Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405 
[MIRROR] [Ready]Brain Trauma additions
 2017-12-21 03:42:38 +00:00
XDTM
3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
XDTM
988dbe87da Brain Traumas 2017-12-06 12:05:20 -06:00
ShizCalev
6ab499b57b Fixes bartender suit having an adjust state 2017-11-22 12:40:32 -06:00
CitadelStationBot
adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00