kevinz000
|
039c56f3a9
|
Merge pull request #11495 from BlackMajor/SpaceRuins
Ash walker camp tweak because Ghommie asked me to.
|
2020-03-17 09:29:05 -07:00 |
|
kevinz000
|
8bc8ea71ea
|
Merge pull request #11500 from necromanceranne/electrostarve_sprite_fix
Electrostaff Sprite Fix
|
2020-03-17 09:25:44 -07:00 |
|
kevinz000
|
9bd275e430
|
Merge remote-tracking branch 'citadel/master' into shield_refactor
|
2020-03-16 13:47:53 -07:00 |
|
kevinz000
|
229b6751ec
|
nerf eshield
|
2020-03-16 13:47:44 -07:00 |
|
kevinz000
|
b062c76ca7
|
Merge pull request #11485 from Ghommie/Ghommie-cit625
Fixing a little issue with the musician trait etcetera.
|
2020-03-16 13:23:25 -07:00 |
|
kevinz000
|
3c97782a87
|
Merge pull request #11483 from Hatterhat/mining-borg-nerfs
mining borg nerfs - "they should be outclassed lategame"
|
2020-03-16 13:22:23 -07:00 |
|
kevinz000
|
7fdbcc55c6
|
s
|
2020-03-16 11:12:10 -07:00 |
|
kevinz000
|
d3724d5fbd
|
f
|
2020-03-16 10:59:34 -07:00 |
|
kevinz000
|
e3301f8722
|
bet
|
2020-03-16 10:44:02 -07:00 |
|
Ghom
|
c4597bc570
|
Update sheet_types.dm
|
2020-03-16 16:59:37 +01:00 |
|
necromanceranne
|
5eb93eaa56
|
And these too
|
2020-03-17 02:49:27 +11:00 |
|
necromanceranne
|
b5872bba63
|
Pretty sure this should now use the correct sprites
|
2020-03-17 02:43:44 +11:00 |
|
kevinz000
|
8fdb1e5964
|
Merge pull request #11465 from Seris02/duffelbagholding
duffel bags of holding
|
2020-03-16 06:12:40 -07:00 |
|
Seris02
|
b8e8a81d1c
|
there
|
2020-03-16 20:49:10 +08: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
|
2a9e4bebdd
|
priority
|
2020-03-16 04:24:18 -07:00 |
|
kevinz000
|
69374c64c9
|
k
|
2020-03-16 04:18:22 -07:00 |
|
kevinz000
|
857f793600
|
ok
|
2020-03-16 04:12:54 -07:00 |
|
kevinz000
|
644273beca
|
k
|
2020-03-16 04:09:25 -07:00 |
|
kevinz000
|
94db06509c
|
slight desword reflect meme buff
|
2020-03-16 03:50:26 -07:00 |
|
kevinz000
|
d32bff7815
|
return list
|
2020-03-16 03:35:10 -07:00 |
|
kevinz000
|
09e1be9651
|
block args
|
2020-03-16 03:32:12 -07:00 |
|
kevinz000
|
703fca5f90
|
add owner argument
|
2020-03-16 03:24:19 -07:00 |
|
kevinz000
|
5d2fb654e8
|
k
|
2020-03-16 03:23:09 -07:00 |
|
kevinz000
|
9ead492bb0
|
changes
|
2020-03-16 00:28:18 -07:00 |
|
BlackMajor
|
97b8d0ba27
|
small ash walker camp tweak
|
2020-03-16 19:51:47 +13:00 |
|
Hatterhat
|
1fe67d5ce9
|
a finger of the monkey's paw curls.
|
2020-03-16 01:35:47 -05:00 |
|
Ghommie
|
5e5bdec85d
|
More runtime errors.
|
2020-03-16 01:55:02 +01:00 |
|
Ghommie
|
ea30b2fb1a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit616
|
2020-03-15 22:35:59 +01:00 |
|
Hatterhat
|
802d37a399
|
borgs should be outclassed lategame and not hunt
|
2020-03-15 15:55:31 -05:00 |
|
Ghom
|
d8a6e9b94f
|
Merge branch 'master' into Ghommie-cit621
|
2020-03-15 13:07:45 +01:00 |
|
kevinz000
|
195a3b593b
|
Merge pull request #11458 from Trilbyspaceclone/patch-310
Buffs borg hypos - Anti-radiation addition
|
2020-03-14 22:21:32 -07:00 |
|
kevinz000
|
4d0677daa9
|
s
|
2020-03-14 21:48:23 -07:00 |
|
kevinz000
|
2113b63428
|
o boy
|
2020-03-14 21:42:23 -07:00 |
|
kevinz000
|
1a061a5d3e
|
agony
|
2020-03-14 21:14:56 -07:00 |
|
kevinz000
|
e73e1b03ec
|
Revert "Stunbaton disarm mode also works on disarm intent now" (#11446)
|
2020-03-14 23:14:57 +01:00 |
|
kevinz000
|
d4131912e9
|
Merge pull request #11452 from Citadel-Station-13/Linzolle-patch-1
make the CMO hypokit not literally worse than normal ones
|
2020-03-14 09:11:58 -07:00 |
|
Seris02
|
5a04b43db4
|
duffel baaaaaaaaaaags
|
2020-03-14 16:12:17 +08:00 |
|
Ghommie
|
1d51ac5ff2
|
Fixing some bug reports.
|
2020-03-14 02:34:25 +01:00 |
|
Trilbyspaceclone
|
6993dfde2a
|
Now stocked at your local robotics
|
2020-03-13 18:29:46 -04:00 |
|
Lin
|
0ca58b5ed8
|
why though
|
2020-03-13 04:19:20 +00:00 |
|
Trilbyspaceclone
|
a2baa47600
|
50 commits of hell
|
2020-03-12 21:27:12 -04:00 |
|
Trilbyspaceclone
|
7b02915cc7
|
Update sheet_types.dm
|
2020-03-12 21:24:20 -04:00 |
|
Ghommie
|
0876a1eef6
|
Porting datum components system updates.
|
2020-03-12 18:22:26 +01:00 |
|
kevinz000
|
87928d43ea
|
stamcrit check for fireaxe afterattack() (#11426)
* Update twohanded.dm
* Update twohanded.dm
|
2020-03-12 14:21:47 +01:00 |
|
kevinz000
|
0b6c5b7960
|
Update twohanded.dm
|
2020-03-11 18:19:09 -07:00 |
|
kevinz000
|
54713dc1e4
|
Merge pull request #11408 from necromanceranne/sleeping_carp_port
Refactors Martial Arts code, human_defense, and ports New Sleeping Carp
|
2020-03-11 17:26:33 -07:00 |
|
kevinz000
|
69c21f4b76
|
Merge pull request #10327 from Seris02/tggenetics
ports tg genetics
|
2020-03-11 17:01:37 -07:00 |
|