b1tt3r1n0
|
d678806143
|
Circle Game, Updated
Title
|
2020-07-14 23:40:09 -04:00 |
|
Ghommie
|
de77b7139c
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-23 00:13:14 +02:00 |
|
Timothy Teakettle
|
7fbfb4ad0e
|
Merge remote-tracking branch 'upstream/master' into embed-changes
|
2020-06-15 22:48:26 +01:00 |
|
Lin
|
bfe8ccdfb5
|
Merge pull request #11627 from kevinz000/combat_rework
"Unofficial" Combat Rework Part 3: Blocking/Parrying
|
2020-06-12 16:39:11 -05:00 |
|
Timothy Teakettle
|
4c55e86da7
|
part 2
|
2020-06-10 23:14:25 +01:00 |
|
Timothy Teakettle
|
95b8cd3956
|
first port
|
2020-06-10 20:33:01 +01:00 |
|
Trilbyspaceclone
|
a2c4b741ad
|
ahaha what if they didnt heal?
|
2020-06-04 21:46:38 -04:00 |
|
Ghommie
|
1bca74465f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-30 03:29:02 +02:00 |
|
kevinz000
|
f326c06324
|
fixEs
|
2020-05-27 21:07:07 -07:00 |
|
Ghom
|
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 |
|
Ghommie
|
a84e7bcecc
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-05-24 04:00:51 +02:00 |
|
Ghom
|
3ac61c0704
|
Porting tg painting code. (#12305)
* Porting tg painting code.
* yes.
|
2020-05-20 18:45:36 -07:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Ghommie
|
a194d7dafe
|
merge conflict and job/dept discounts support.
|
2020-05-03 02:11:05 +02:00 |
|
Trilbyspaceclone
|
8bcdbf5fc6
|
Update weaponry.dm
|
2020-04-23 03:29:26 -04:00 |
|
Trilbyspaceclone
|
6a99c3b2c0
|
oops all the )
|
2020-04-22 18:07:13 -04:00 |
|
Trilbyspaceclone
|
3418fe1541
|
Update weaponry.dm
|
2020-04-22 17:32:35 -04:00 |
|
Trilbyspaceclone
|
e769d28a2d
|
Update weaponry.dm
|
2020-04-20 18:47:18 -04:00 |
|
Ghommie
|
4c6f1b622b
|
Porting Goofconomy & co.
|
2020-04-17 07:48:11 +02:00 |
|
kappa-sama
|
a60257b0e2
|
o7
|
2020-04-08 00:05:32 -04:00 |
|
Lin
|
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 |
|
Artur
|
65ec9f3723
|
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
|
2020-04-01 13:03:06 +03:00 |
|
Artur
|
4de14fbdf7
|
Finnishing touches
|
2020-04-01 12:59: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
|
d3724d5fbd
|
f
|
2020-03-16 10:59:34 -07:00 |
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
kevinz000
|
a77be038b8
|
refactoring this whole thing again
|
2020-03-16 04:56:32 -07:00 |
|
kevinz000
|
763c835a53
|
bitflags not equals
|
2020-03-16 04:26:19 -07:00 |
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
kevinz000
|
29727b2fc9
|
Merge pull request #11306 from Ghommie/Ghommie-cit598
Removes makeshift switchblades
|
2020-03-06 00:20:36 -07:00 |
|
Ghommie
|
f08d79767b
|
Removes makeshift switchblades
|
2020-03-02 19:33:31 +01:00 |
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
Ghommie
|
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 |
|
Hatterhat
|
0f5ea361e7
|
bada bing bada boom
|
2020-02-15 14:07:35 -06:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
ShadeAware
|
c46c683664
|
FIXES FANCY SWITCHBLADES
ONCE, AND FOR ALL MAYBE HOPEFULLY FINALLY. FUCK!!!
|
2020-01-31 21:12:08 -05:00 |
|
Arturlang
|
d26ca9dbf0
|
Fixes this
|
2020-01-31 13:57:30 +01:00 |
|
Ghom
|
1caa2af4cf
|
Update weaponry.dm
|
2020-01-30 04:05:35 +01:00 |
|
Ghom
|
793cc26ddc
|
Update weaponry.dm
|
2020-01-30 03:28:47 +01:00 |
|
Ghom
|
096d9e01e1
|
Update weaponry.dm
|
2020-01-30 03:19:04 +01:00 |
|
Ghom
|
b2ca380a13
|
Update weaponry.dm
|
2020-01-30 03:15:24 +01:00 |
|
ShadeAware
|
92398ae354
|
Why am I having such trouble with a fucking SPAN CLASS
|
2020-01-26 19:46:30 -05:00 |
|
ShadeAware
|
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 |
|
ShadeAware
|
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 |
|
ShadeAware
|
2cd6ed5f26
|
REEEE STRAY SLASHES
WHY CAN'T I DO THINGS RIGHT THE FIRST TIME
|
2020-01-26 16:31:00 -05:00 |
|
ShadeAware
|
732dd8a3bb
|
Hmm, today I will forget quotes on my strings.
Thank you Putnam.
|
2020-01-26 16:11:22 -05:00 |
|
ShadeAware
|
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 |
|
ShadeAware
|
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 |
|
Ghom
|
51812ae0ec
|
Proud? No.
|
2020-01-23 16:33:11 +01:00 |
|
ShadeAware
|
fd04469ff0
|
H
|
2020-01-23 08:01:28 -05:00 |
|