kevinz000
|
ce8153e7fd
|
aa
|
2020-02-27 20:12:52 -07:00 |
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
kevinz000
|
9bd4719c0a
|
wrong type
|
2020-02-27 20:09:29 -07:00 |
|
kevinz000
|
045d5b2dbf
|
fixes
|
2020-02-27 20:06:52 -07:00 |
|
kevinz000
|
f4e49f339b
|
k
|
2020-02-27 18:29:27 -07:00 |
|
Ghom
|
879032c52f
|
Merge pull request #11255 from deathride58/sprintconfigdefaults
Makes the default sprint config options match live's actual config
|
2020-02-27 16:23:27 +01:00 |
|
Ghom
|
ebe16768d4
|
Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
|
2020-02-27 12:40:41 +01:00 |
|
kevinz000
|
b854cb5980
|
Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1
Adds 2cat, again
|
2020-02-27 01:22:25 -07:00 |
|
YakumoChen
|
f6c170d31b
|
Update tails.dm
|
2020-02-27 08:15:27 +00:00 |
|
YakumoChen
|
e682845ebf
|
Update tails.dm
|
2020-02-27 08:09:34 +00:00 |
|
kevinz000
|
b0018a246c
|
Merge pull request #11248 from Putnam3145/lick-pref
Made lick prefs actually save
|
2020-02-27 01:05:56 -07:00 |
|
YakumoChen
|
2cb95e200a
|
Update tails.dm
|
2020-02-27 08:04:32 +00:00 |
|
kevinz000
|
19962493a9
|
Merge pull request #11241 from Arturlang/Solar_updates
Ports TGs Solar updates.
|
2020-02-27 01:03:52 -07:00 |
|
YakumoChen
|
e0c7c98253
|
Update tails.dm
|
2020-02-27 08:01:13 +00:00 |
|
kevinz000
|
924c7e0d05
|
Merge pull request #11235 from Detective-Google/if-it-compiles-it-works
unfucks paramedics access + PDA
|
2020-02-27 01:00:45 -07:00 |
|
kevinz000
|
f00a2c1cd3
|
Merge pull request #11202 from Hatterhat/beegions-but-actual-bees
Beegions, But With Actual Bees
|
2020-02-27 00:59:57 -07:00 |
|
kevinz000
|
a92baba125
|
Merge pull request #11220 from Kraseo/powersink-of-tc
Gives traitors with power-draining sabotage objective a free powersink
|
2020-02-27 00:59:20 -07:00 |
|
kevinz000
|
40c36213df
|
Merge pull request #11244 from Ghommie/Ghommie-cit589
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
|
2020-02-27 00:57:54 -07:00 |
|
kevinz000
|
a8a8e242d8
|
Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1
Adds 2cat (tail)
|
2020-02-27 00:54:47 -07:00 |
|
kevinz000
|
648e304ef8
|
Merge pull request #11240 from Trilbyspaceclone/patch-297
Raises blob point cap by 150 (aka they can store 250 now)
|
2020-02-27 00:53:10 -07:00 |
|
Ghom
|
6e25a34aaa
|
Merge pull request #11257 from Linzolle/pacifist-spike
pacifists can no longer meatspike
|
2020-02-27 01:18:57 +01:00 |
|
Ghom
|
803ac258f8
|
Merge pull request #11254 from deathride58/fuckclosets
Makes harm intent clicking closets attack them rather than place an item inside
|
2020-02-27 01:11:23 +01:00 |
|
Ghom
|
2c642d5507
|
Update kitchen_spike.dm
|
2020-02-27 01:10:38 +01:00 |
|
Ghom
|
7eac87d2e0
|
Merge pull request #11252 from Citadel-Station-13/kevinz000-patch-12
fixes electrostaves being invisible
|
2020-02-27 01:09:47 +01:00 |
|
Ghom
|
954f03f4e0
|
Merge pull request #11150 from raspyosu/master
Bloodsucker Abilities Tweaks/Rebalances
|
2020-02-27 00:54:41 +01:00 |
|
kevinz000
|
1711fcaa06
|
k
|
2020-02-26 15:56:01 -07:00 |
|
Lin
|
69e3d857a8
|
derp
|
2020-02-26 21:39:53 +00:00 |
|
Lin
|
ac384e4d70
|
consistency?
|
2020-02-26 21:01:34 +00:00 |
|
Lin
|
c708d30d47
|
shitty webedit
|
2020-02-26 20:59:32 +00:00 |
|
deathride58
|
d7192a7c35
|
Makes the default sprint config options match live's actual config
|
2020-02-26 10:21:26 -05:00 |
|
deathride58
|
c232356a88
|
Makes clicking open closets with items on harm intent attack the closet rather than put the item in the closet
|
2020-02-26 09:51:48 -05:00 |
|
Artur
|
27b6469c67
|
Forgot a var
|
2020-02-26 16:42:38 +02:00 |
|
kevinz000
|
25a2b34c38
|
some fixes
|
2020-02-26 05:59:53 -07:00 |
|
kevinz000
|
872872d9f9
|
move stuff
|
2020-02-26 05:38:34 -07:00 |
|
kevinz000
|
626cf886d6
|
Update twohanded.dm
|
2020-02-26 05:31:47 -07:00 |
|
Trilbyspaceclone
|
7fe6ebb2c9
|
Update chair.dm
|
2020-02-26 00:24:09 -05:00 |
|
Putnam
|
c906f8f17f
|
lickable.
|
2020-02-25 20:49:01 -08:00 |
|
Putnam
|
0a698d1eeb
|
oy.
|
2020-02-25 20:07:07 -08:00 |
|
kevinz000
|
76c1d5ddb9
|
k
|
2020-02-25 15:40:00 -07:00 |
|
kevinz000
|
5a320c7933
|
fugg u
|
2020-02-25 14:37:40 -07:00 |
|
kevinz000
|
40c2bdf5ee
|
oh boy
|
2020-02-25 14:06:12 -07:00 |
|
Ghom
|
5bd62d129f
|
Merge pull request #10877 from kevinz000/staves
Riot Electrostaves
|
2020-02-25 20:32:36 +01:00 |
|
Ghommie
|
e02a6f6dea
|
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
|
2020-02-25 15:37:02 +01:00 |
|
Ghom
|
56d5899bbc
|
Merge pull request #11236 from bunny232/master
Sentience event preference xenomorph to sentience potion
|
2020-02-25 15:19:28 +01:00 |
|
Ghom
|
5ee2f0dcd8
|
Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
|
2020-02-25 14:48:37 +01:00 |
|
Artur
|
00403a39c6
|
Reverts tracker changes somewhat
|
2020-02-25 15:47:15 +02:00 |
|
Ghom
|
ea5774e713
|
Merge pull request #11225 from r4d6/Random-Mining
Make the mining base's placement random
|
2020-02-25 14:41:40 +01:00 |
|
Ghom
|
b8fa0c0977
|
Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12
plushies now use SAFEPICK
|
2020-02-25 14:31:07 +01:00 |
|
kevinz000
|
bfb8139225
|
DefaultCombatknockdown
|
2020-02-25 03:18:37 -07:00 |
|
kevinz000
|
8b06f6d4e9
|
message fix
|
2020-02-25 03:08:34 -07:00 |
|