SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Letter N
|
a808f805d4
|
ASYNC EVERYTHING!
|
2020-12-21 16:24:51 +08:00 |
|
Timothy Teakettle
|
289c186f32
|
Merge remote-tracking branch 'upstream/master' into wounds-part-2
|
2020-08-02 18:11:07 +01:00 |
|
Dan-Neposh
|
44e6b6ccc7
|
I removed the Dread_Ipad, Clockwork Slab reigns supreme
|
2020-08-01 16:18:25 -04:00 |
|
Timothy Teakettle
|
9721025582
|
Merge branch 'master' into wounds-part-2
|
2020-07-29 15:47:44 +01:00 |
|
Timothy Teakettle
|
7fb55a02a5
|
section one
|
2020-07-24 22:34:22 +01:00 |
|
silicons
|
98d3ac80d9
|
:pika:
|
2020-07-20 11:25:17 -07:00 |
|
silicons
|
6cbab55ef8
|
Merge remote-tracking branch 'citadel/master' into unarmed_parry
|
2020-07-07 21:07:58 -07:00 |
|
silicons
|
6ee63f66aa
|
whew
|
2020-07-07 20:48:54 -07:00 |
|
BlackMajor
|
afdf8c698a
|
fuck
|
2020-07-04 19:30:20 +12:00 |
|
BlackMajor
|
7c21f7bd4e
|
[s] Don't give these to your kids for christmas
Someone did a fucky wucky.
|
2020-07-04 17:17:34 +12:00 |
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02: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 |
|
kevinz000
|
bad809ffce
|
fixes
|
2020-06-04 19:56:06 -07:00 |
|
Ghom
|
07e42c079c
|
Fixing cards states and user-less projectiles checking mean armor values. (#12400)
|
2020-06-02 15:24:13 -07: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 |
|
TheFakeElon
|
9d169fc43e
|
Adds unum (#12369)
* unoo
* bracket
* COMMA
* Update toys.dm
* fixes icons
* Update code/game/objects/items/toys.dm
Thanks ghommie
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
* pool noodle and viro
* removes dupes
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-05-28 15:47:44 +02:00 |
|
Ghommie
|
30ab79e09e
|
Porting the twohanded component.
|
2020-05-17 18:16:53 +02:00 |
|
Ghommie
|
364ca3fdf2
|
There is more!
|
2020-05-09 01:14:29 +02:00 |
|
Ghommie
|
001109cfcd
|
About ready.
|
2020-05-05 20:58:44 +02:00 |
|
Ghommie
|
05a954f000
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
|
2020-04-13 02:01:01 +02:00 |
|
Ghommie
|
7c1e5aa2c9
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
|
2020-04-09 15:46:19 +02:00 |
|
Ghommie
|
c3faf94d8f
|
WIP
|
2020-03-30 05:29:39 +02:00 |
|
kevinz000
|
6af9c54da5
|
better
|
2020-03-16 04:59:55 -07:00 |
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
kevinz000
|
4d0677daa9
|
s
|
2020-03-14 21:48:23 -07:00 |
|
Ghommie
|
2b4b626fac
|
support for items that switch states through update_icon.
|
2020-03-10 16:55:30 +01:00 |
|
deathride58
|
2e35c09dec
|
Merge pull request #10451 from kevinz000/mobility_flags
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
|
2020-03-05 20:03:56 -05:00 |
|
Ghom
|
a2fe9f0d23
|
Update toys.dm
|
2020-03-04 17:03:26 +01:00 |
|
kevinz000
|
1e99cd0bfe
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-03-03 03:08:41 -07:00 |
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01:00 |
|
kevinz000
|
f6542b381c
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 23:29:25 -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 |
|
kevinz000
|
a784a74ccb
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-21 13:35:26 -07:00 |
|
Ghom
|
f94f997cc2
|
Merge pull request #11080 from kevinz000/surubatons
hey someone gave me this idea for stunbatons (and I sort of expanded it) and it's worth a test
|
2020-02-20 11:09:46 +01:00 |
|
kevinz000
|
0e4692c63d
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-18 18:16:34 -07:00 |
|
kevinz000
|
379c914099
|
Merge pull request #10704 from Ghommie/Ghommie-cit529
More Runtimenator fixes.
|
2020-02-16 05:10:19 -07:00 |
|
kevinz000
|
e8ccf4b6d7
|
fix
|
2020-02-13 16:25:43 -07:00 |
|
kevinz000
|
eca0e0f2dc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-13 00:39:20 -07:00 |
|
Ghommie
|
8131a60f3a
|
Oh.
|
2020-02-06 02:10:03 +01:00 |
|
Ghommie
|
523e080f87
|
Double-esword and hypereuplastic blade toys are sharp now blunt.
|
2020-02-06 02:09:27 +01:00 |
|
kevinz000
|
6a8a606f97
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-04 16:01:25 -07:00 |
|
Ghommie
|
a726f09201
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
|
2020-02-04 03:54:52 +01:00 |
|
Ghommie
|
95db5084ab
|
Screw commit history.
|
2020-02-02 01:26:04 +01:00 |
|
Ghommie
|
0dba1b5102
|
added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.
|
2020-01-30 02:17:02 +01:00 |
|
Ghommie
|
f2b04be561
|
More Runtimenator fixes.
|
2020-01-25 02:16:45 +01:00 |
|
kevinz000
|
6e31db958c
|
fixes
|
2020-01-20 12:08:18 -07:00 |
|