bfe8ccdfb5
Merge pull request #11627 from kevinz000/combat_rework
...
"Unofficial" Combat Rework Part 3: Blocking/Parrying
2020-06-12 16:39:11 -05:00
a2c4b741ad
ahaha what if they didnt heal?
2020-06-04 21:46:38 -04:00
f326c06324
fixEs
2020-05-27 21:07:07 -07:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
3ac61c0704
Porting tg painting code. ( #12305 )
...
* Porting tg painting code.
* yes.
2020-05-20 18:45:36 -07:00
a194d7dafe
merge conflict and job/dept discounts support.
2020-05-03 02:11:05 +02:00
8bcdbf5fc6
Update weaponry.dm
2020-04-23 03:29:26 -04:00
6a99c3b2c0
oops all the )
2020-04-22 18:07:13 -04:00
3418fe1541
Update weaponry.dm
2020-04-22 17:32:35 -04:00
e769d28a2d
Update weaponry.dm
2020-04-20 18:47:18 -04:00
4c6f1b622b
Porting Goofconomy & co.
2020-04-17 07:48:11 +02:00
a60257b0e2
o7
2020-04-08 00:05:32 -04:00
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
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
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
d3724d5fbd
f
2020-03-16 10:59:34 -07:00
6af9c54da5
better
2020-03-16 04:59:55 -07:00
a77be038b8
refactoring this whole thing again
2020-03-16 04:56:32 -07:00
763c835a53
bitflags not equals
2020-03-16 04:26:19 -07:00
644273beca
k
2020-03-16 04:09:25 -07:00
29727b2fc9
Merge pull request #11306 from Ghommie/Ghommie-cit598
...
Removes makeshift switchblades
2020-03-06 00:20:36 -07:00
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +01:00
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
0f5ea361e7
bada bing bada boom
2020-02-15 14:07:35 -06:00
95db5084ab
Screw commit history.
2020-02-02 01:26:04 +01:00
c46c683664
FIXES FANCY SWITCHBLADES
...
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
2020-01-31 21:12:08 -05:00
d26ca9dbf0
Fixes this
2020-01-31 13:57:30 +01:00
1caa2af4cf
Update weaponry.dm
2020-01-30 04:05:35 +01:00
793cc26ddc
Update weaponry.dm
2020-01-30 03:28:47 +01:00
096d9e01e1
Update weaponry.dm
2020-01-30 03:19:04 +01:00
b2ca380a13
Update weaponry.dm
2020-01-30 03:15:24 +01:00
92398ae354
Why am I having such trouble with a fucking SPAN CLASS
2020-01-26 19:46:30 -05:00
f7373ae40d
WHY DID THE INDENTATION NOT SHOW IT WAS FUCKED UP BEFORE
...
WEBEDIT CHANGE WEBEDIT CHANGE REEEEEEEEEEEEEE
2020-01-26 19:42:21 -05:00
fffea32a59
Lets the user know they improved their switchblade.
...
Confusion is bad. Lets make it not confusing.
2020-01-26 19:26:58 -05:00
2cd6ed5f26
REEEE STRAY SLASHES
...
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
2020-01-26 16:31:00 -05:00
732dd8a3bb
Hmm, today I will forget quotes on my strings.
...
Thank you Putnam.
2020-01-26 16:11:22 -05:00
e75807430b
Adds Makeshift Sprites and Fancy Sprites; Fancy Crafting
...
Not actually crafting but you get the idea. This won't compile haha.
2020-01-26 15:53:37 -05:00
f547c8692b
Changes all references of "Makeshift" to "Crafted" because im not willing to change the switchblade's fucking SEXY SPRITE
...
YOU CAN'T MAKE ME DO IT GHOMMIE, THAT IS SOMETHING I WILL NOT COMPROMISE ON.
2020-01-23 16:40:30 -05:00
51812ae0ec
Proud? No.
2020-01-23 16:33:11 +01:00
fd04469ff0
H
2020-01-23 08:01:28 -05:00
0b1a0e7286
Update weaponry.dm
2020-01-22 17:54:27 -05:00
1c4f37b5bf
MAKING THE CODE LESS SHIT THANS TO ARTUR AND SUN WUKONG
...
WHY DID IT TAKE ME SO LONG TO DO THIS THEY LITERALLY SPOONFED ME THE INFORMATION GOD IM SO FUCKING STUPID AND RETARD GOD I FUCKING I FHUHDHJUGDFJTUFUGFUG7F7BGFJKDOKDIVFUBHFB
2020-01-22 17:50:57 -05:00
08016a8461
Ghommie commands, I obey.
2020-01-20 20:22:09 -05:00
9f488c80a1
Update weaponry.dm
2020-01-20 18:49:04 -05:00
6f243f9c44
Update weaponry.dm
2020-01-20 18:08:05 -05:00
ffef7cd4db
Update weaponry.dm
2020-01-20 17:33:18 -05:00
16a37e2769
Standardises all files from CRLF to LF
2020-01-12 14:28:01 +00:00
c81d1fe7a3
Merge pull request #9867 from Ghommie/Ghommie-cit375
...
Ports "examine-code refactor"
2019-11-25 11:31:03 +13:00
Lin