kevinz000
c35ffacf50
k
2020-03-16 04:29:18 -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
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
7a27baa699
Merge pull request #11450 from zeroisthebiggay/timefornekerchiefsuwu
...
ports ([READY] Allows bandannas to be worn as neckerchiefs. #40125 ) from TG code
2020-03-14 09:12:12 -07: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
kevinz000
0953ec19e5
Merge pull request #11453 from necromanceranne/I_am_at_high_risk_of_stroke
...
I'm pretty sure this was causing people to bleed out from light hits
2020-03-14 09:11:38 -07:00
kevinz000
a21458bba6
Merge pull request #11437 from keronshb/BlobBuffPort
...
Ports Blob Buffs
2020-03-14 09:10:54 -07:00
kevinz000
395fa32136
Merge pull request #11447 from Ghommie/Ghommie-cit618
...
Porting datum components system updates.
2020-03-14 09:09:50 -07:00
kevinz000
a35049fc94
Merge pull request #11448 from Ghommie/Ghommie-cit619
...
Makes the autotransfer subsystem slightly more modulable.
2020-03-14 09:09:11 -07:00
Putnam3145
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
necromanceranne
49c0aba205
bleeding out from a toolbox smack is not cool gamers
2020-03-14 04:25:12 +11:00
Lin
0ca58b5ed8
why though
2020-03-13 04:19:20 +00:00
ZeroMan
3fa39fd7ab
i hate my ocd
2020-03-12 20:57:41 -04:00
ZeroMan
f5ec7f5b65
it works it works
2020-03-12 20:47:35 -04:00
Ghommie
da5b293033
underscores.
2020-03-12 21:31:17 +01:00
Ghommie
d1b39b6590
.
2020-03-12 21:22:39 +01:00
Ghommie
0602e728c0
Doesn't delete the old auto transfer behavior.
2020-03-12 21:15:12 +01:00
Ghommie
663a849afe
Makes the autotransfer subsystem a bit more optional.
2020-03-12 21:02:34 +01:00
Ghommie
0876a1eef6
Porting datum components system updates.
2020-03-12 18:22:26 +01:00
kevinz000
bbd69c407c
Merge pull request #11431 from Citadel-Station-13/Ghommie-patch-1
...
Missing contractor tablet icon state fix
2020-03-12 09:49:50 -07:00
kevinz000
78aa46d8de
Merge pull request #11416 from Trilbyspaceclone/patch-306
...
Makes Bluespace and Urianium reagents be able to be turned into sheets
2020-03-12 09:49:26 -07:00
Trilbyspaceclone
b4f57a8885
Update others.dm
2020-03-12 10:56:25 -04:00
Trilbyspaceclone
41ed18a537
Changes up some lava land ruins spawns ( #11422 )
...
* Update lavaland.dm
* Update lavaland.dm
2020-03-12 14:25:54 +01:00
kevinz000
87928d43ea
stamcrit check for fireaxe afterattack() ( #11426 )
...
* Update twohanded.dm
* Update twohanded.dm
2020-03-12 14:21:47 +01:00
Ghom
442eb13e75
Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3
...
fixes synthflesh/rezadone dehusk threshold check
2020-03-12 14:20:49 +01:00
Ghom
9e3a3dddfd
Merge pull request #11429 from Putnam3145/dynamic-tweaks
...
Dynamic tweaks/fixes
2020-03-12 14:20:28 +01:00
Ghom
9e970b4a3e
Merge pull request #11430 from Putnam3145/fix-transfer
...
Tweaks for the transfer vote
2020-03-12 14:20:10 +01:00
Ghom
c771471895
Merge pull request #11406 from kevinz000/minimaps
...
Ports station minimaps from Yogstation thank you monster860 you are an epic gamer
2020-03-12 14:18:39 +01:00
kevinz000
0b6c5b7960
Update twohanded.dm
2020-03-11 18:19:09 -07:00
Ghom
88bdc6d068
Merge pull request #11440 from kevinz000/master_fix
...
fixes master
2020-03-12 01:54:15 +01:00
Ghom
dbc54ab699
Update actions.dm
2020-03-12 01:47:51 +01:00
kevinz000
fa160d4c3a
Merge pull request #11434 from Citadel-Station-13/Ghommie-patch-3
...
Fixes flavor text preview on the chatbox.
2020-03-11 17:44:35 -07:00
kevinz000
db188f8681
Merge pull request #11307 from kappa-sama/patch-17
...
gets rid of fly species requirement from hulk
2020-03-11 17:43:23 -07:00
kevinz000
6127f6a453
k
2020-03-11 17:41:12 -07:00
kevinz000
14b22f0b67
Merge remote-tracking branch 'citadel/master' into minimaps
2020-03-11 17:32:15 -07:00
kevinz000
3ae8016ec8
Merge pull request #11373 from kappa-sama/supershotty
...
miner powercreep starring 150 damage pointblank shotgun
2020-03-11 17:27:22 -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
kappa-sama
80b17cff1f
Merge branch 'master' into patch-17
2020-03-11 20:26:13 -04:00
