 Lin
|
d32cc370ad
|
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
Broom shenanigeans.
|
2020-02-29 00:22:24 -06:00 |
|
|
Lin
|
5ee4a355c1
|
Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2
Fixing refrigerators locking when closed
|
2020-02-29 00:21:43 -06:00 |
|
|
Hatterhat
|
1577a00ab5
|
tg 45232
|
2020-02-28 21:54:55 -06:00 |
|
|
kevinz000
|
ba55351e4a
|
Update twohanded.dm
|
2020-02-28 13:43:11 -07:00 |
|
|
kevinz000
|
93d91b1808
|
Merge remote-tracking branch 'citadel/master' into sword_point
|
2020-02-28 13:39:56 -07:00 |
|
|
kevinz000
|
8ef68fa36b
|
En garde!
|
2020-02-28 13:35:41 -07:00 |
|
|
Ghom
|
d5c2c54f32
|
Update fancy.dm
|
2020-02-28 19:14:58 +01:00 |
|
|
Ghom
|
c9a5f49623
|
Fixing a whoopsie with airlocks.
|
2020-02-28 17:28:02 +01:00 |
|
|
Artur
|
bf837d97d7
|
Merge remote-tracking branch 'Arturlang/Garlic' into Garlic
|
2020-02-28 14:12:12 +02:00 |
|
|
Artur
|
5d3f3fc06a
|
WIP
|
2020-02-28 14:11:38 +02:00 |
|
|
kevinz000
|
e39d7fa49d
|
Merge pull request #11259 from Ghommie/Ghommie-cit590
Porting update_icon improvements.
|
2020-02-28 04:30:12 -07:00 |
|
|
kevinz000
|
25f86c18d1
|
Merge pull request #11260 from Kraseo/i-hate-gangs
Removes soporific sniper rifle rounds from gang uplinks
|
2020-02-28 04:29:22 -07:00 |
|
|
ancientpower
|
12ba71f588
|
paramedic tweaks
|
2020-02-27 23:23:44 -06:00 |
|
|
kevinz000
|
56eab760fc
|
Merge remote-tracking branch 'citadel/master' into mobility_flags
|
2020-02-27 20:11:36 -07:00 |
|
|
kevinz000
|
045d5b2dbf
|
fixes
|
2020-02-27 20:06:52 -07:00 |
|
|
Seris02
|
5edfcd2927
|
yeet
|
2020-02-27 20:33:57 +08:00 |
|
|
Ghom
|
ebe16768d4
|
Merge pull request #11249 from Trilbyspaceclone/patch-298
Corrects bar stool name
|
2020-02-27 12:40:41 +01: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 |
|
|
Kraseo
|
9da493b483
|
i genuinely do not like anything robustin has ever touched in his lifetime
|
2020-02-27 02:28:13 +01:00 |
|
|
Ghom
|
a99e9ec2ff
|
Ok
|
2020-02-27 02:15:03 +01:00 |
|
|
Ghommie
|
b5f472c6dd
|
thank you dreamchecker
|
2020-02-27 01:47:18 +01:00 |
|
|
Ghommie
|
fc76cd9a9b
|
Porting update_icon improvements. Part 1.
|
2020-02-27 01:21:03 +01: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 |
|
|
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
|
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 |
|
|
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 |
|
|
BlackMajor
|
be740ba690
|
Merge branch 'master' into SpaceRuins
|
2020-02-26 20:58:46 +13:00 |
|
|
Trilbyspaceclone
|
7fe6ebb2c9
|
Update chair.dm
|
2020-02-26 00:24:09 -05: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 |
|
|
Artur
|
74d6473c3b
|
Initial Commit
Changes isvamp() to isbloodsucker(), adds a isvampire() check for the race itself, reworks regen cores codewise, adds a defib check for bloodsuckers
|
2020-02-25 17:07:40 +02:00 |
|
|
Ghom
|
5ee2f0dcd8
|
Merge pull request #11169 from PersianXerxes/ohHeyKilo
Ports Kilo Station from Skyrat
|
2020-02-25 14:48:37 +01: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 |
|
|
BlackMajor
|
fc85f62546
|
Merge branch 'master' into SpaceRuins
|
2020-02-25 16:51:39 +13:00 |
|
|
kevinz000
|
00c70acee9
|
Target wew
|
2020-02-24 13:20:12 -07:00 |
|
|
kevinz000
|
26b908f53d
|
thonk
|
2020-02-24 13:19:38 -07:00 |
|
|
kevinz000
|
90d7fd81b1
|
k
|
2020-02-24 13:17:08 -07:00 |
|
|
kevinz000
|
fa9e275237
|
k
|
2020-02-24 13:16:12 -07:00 |
|
|
kevinz000
|
59e95555bb
|
Merge remote-tracking branch 'citadel/master' into staves
|
2020-02-24 13:09:45 -07:00 |
|
|
Ghom
|
f86e17d945
|
Merge pull request #11129 from Owai-Seek/movefood-2-16-20
Reorganize Food Recipes, "Balance" Tweaks
|
2020-02-24 20:53:36 +01:00 |
|
|
r4d6
|
f76a1c15f3
|
Port random mining base
|
2020-02-24 13:27:54 -05:00 |
|
|
TrilbySpaceClone
|
d138878e03
|
peace is an option
stops unneeded well violence
|
2020-02-24 12:18:49 -05:00 |
|