b5872bba63
Pretty sure this should now use the correct sprites
2020-03-17 02:43:44 +11:00
8fdb1e5964
Merge pull request #11465 from Seris02/duffelbagholding
...
duffel bags of holding
2020-03-16 06:12:40 -07:00
b8e8a81d1c
there
2020-03-16 20:49:10 +08: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
2a9e4bebdd
priority
2020-03-16 04:24:18 -07:00
69374c64c9
k
2020-03-16 04:18:22 -07:00
857f793600
ok
2020-03-16 04:12:54 -07:00
644273beca
k
2020-03-16 04:09:25 -07:00
94db06509c
slight desword reflect meme buff
2020-03-16 03:50:26 -07:00
d32bff7815
return list
2020-03-16 03:35:10 -07:00
09e1be9651
block args
2020-03-16 03:32:12 -07:00
703fca5f90
add owner argument
2020-03-16 03:24:19 -07:00
5d2fb654e8
k
2020-03-16 03:23:09 -07:00
9ead492bb0
changes
2020-03-16 00:28:18 -07:00
97b8d0ba27
small ash walker camp tweak
2020-03-16 19:51:47 +13:00
1fe67d5ce9
a finger of the monkey's paw curls.
2020-03-16 01:35:47 -05:00
fae84f9ee6
Merge pull request #11462 from Ghommie/Ghommie-cit621
...
Fixing some bug reports.
2020-03-15 23:03:59 -07:00
259bb03969
fixes the swapping of buttons ( #11475 )
2020-03-16 01:57:55 +01:00
5e5bdec85d
More runtime errors.
2020-03-16 01:55:02 +01:00
a1618a4550
Webedit fixing a runtime.
2020-03-16 00:35:19 +01:00
8af3d0e2fa
Fixing a little issue with the musician trait etcetera.
2020-03-16 00:09:03 +01:00
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
2b9f352a14
Fixing a couple issues with recyclers.
2020-03-15 22:12:55 +01:00
802d37a399
borgs should be outclassed lategame and not hunt
2020-03-15 15:55:31 -05:00
b453a25e14
Something about banana pies, runtime errors and warnings.
2020-03-15 15:41:32 +01:00
5bfbcd0948
Fixing some GetElement runtimes.
2020-03-15 15:12:35 +01:00
d8a6e9b94f
Merge branch 'master' into Ghommie-cit621
2020-03-15 13:07:45 +01:00
195a3b593b
Merge pull request #11458 from Trilbyspaceclone/patch-310
...
Buffs borg hypos - Anti-radiation addition
2020-03-14 22:21:32 -07:00
4d79230f87
Merge pull request #11467 from Kraseo/i-love-spaceruins
...
Adds a blacklist to contractor dropoff areas
2020-03-14 22:11:21 -07:00
4d0677daa9
s
2020-03-14 21:48:23 -07:00
2113b63428
o boy
2020-03-14 21:42:23 -07:00
1a061a5d3e
agony
2020-03-14 21:14:56 -07:00
e73e1b03ec
Revert "Stunbaton disarm mode also works on disarm intent now" ( #11446 )
2020-03-14 23:14:57 +01:00
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
395fa32136
Merge pull request #11447 from Ghommie/Ghommie-cit618
...
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
f8a365490b
FUCK²
2020-03-14 13:15:09 +01:00
3f44882c1a
FUCK
2020-03-14 13:13:26 +01:00
a2592483b5
hey did you know there's not one, not two, but three tiles on roid7.dmm that don't have /area/ruin/space but rather /area/ruin/unpowered? yeah i'm angry too
2020-03-14 13:07:13 +01:00
5a04b43db4
duffel baaaaaaaaaaags
2020-03-14 16:12:17 +08:00
d9dc91db1a
More dynamic fixes ( #11451 )
...
* Fixed wizard, malf AI
* changed memes typename to story
* Fixed a bunch of really weird execute/ready confusion
* Added dynamic requirement to wands.
2020-03-14 02:49:25 +01:00
1d51ac5ff2
Fixing some bug reports.
2020-03-14 02:34:25 +01:00
6993dfde2a
Now stocked at your local robotics
2020-03-13 18:29:46 -04:00
0ca58b5ed8
why though
2020-03-13 04:19:20 +00:00
a2baa47600
50 commits of hell
2020-03-12 21:27:12 -04:00
7b02915cc7
Update sheet_types.dm
2020-03-12 21:24:20 -04:00
8ccd0d2cbc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit595
2020-03-12 20:31:14 +01:00
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
87928d43ea
stamcrit check for fireaxe afterattack() ( #11426 )
...
* Update twohanded.dm
* Update twohanded.dm
2020-03-12 14:21:47 +01:00
necromanceranne