Ghom
976080d7b2
Merge pull request #11314 from KathrinBailey/Kat-Furniture
...
Kat Furniture! New sofas, chess pieces, nine new posters and shower curtain functionality!
2020-03-04 15:40:01 +01:00
Ghom
8c6b5b49c5
Update contraband.dm
2020-03-04 15:39:23 +01:00
KathrinBailey
11750b4fa9
removed redundant icon line
2020-03-04 14:16:27 +00:00
kevinz000
f67fa08f0f
Merge pull request #11274 from Citadel-Station-13/Ghommie-patch-5
...
Fixing a whoopsie with airlocks.
2020-03-04 05:58:44 -07:00
KathrinBailey
97733e464d
ghommie change and armrest bug fix
2020-03-04 01:35:00 +00:00
Ghom
62eef87835
Merge pull request #11289 from Trilbyspaceclone/patch-301
...
Cotton/Durathreads now stack to 80
2020-03-03 21:30:14 +01:00
KathrinBailey
86790c69a5
credits accidently left out previously
...
re-adds nod to CEV Eris for their original sprites.
2020-03-03 14:38:16 +00:00
KathrinBailey
7e0abda3c1
fixing merge conflicts
...
includes trillby's new posters.
2020-03-03 13:56:01 +00:00
KathrinBailey
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +00:00
KathrinBailey
fe7742637f
fixing merge conflicts aaahh
2020-03-03 13:47:58 +00:00
Trilbyspaceclone
d32b6ad7e9
ok
2020-03-03 08:47:17 -05:00
KathrinBailey
a240daaca2
Final changes
...
Puts curtain crafting under plastic to stop plastic duping. You can deep rods and cloth, but the cost is 10 plastic sheets and it doesn't drop 10 plastic sheets so it's a loss.
2020-03-03 13:19:15 +00:00
Ghom
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
Ghom
c984cd7677
Merge pull request #11270 from ancientpower/paramedic-tweaks
...
Paramedic tweaks (sprites/access/stuff for future use)
2020-03-02 22:46:49 +01:00
kevinz000
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
KathrinBailey
d817442f02
It works!
...
Everything works now.
2020-03-01 13:42:14 +00:00
KathrinBailey
72d3572ec3
New sofas added, need to be added to sheet_types.dm still
...
Backing up the .dmi changes and two comfy chairs.
2020-03-01 11:58:59 +00:00
Trilbyspaceclone
71c26c287e
Update sheet_types.dm
2020-03-01 01:55:03 -05:00
Trilbyspaceclone
12ea1132c4
Apply suggestions from code review
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-03-01 00:43:34 -05:00
ancientpower
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
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
Ghom
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
kevinz000
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
ancientpower
12ba71f588
paramedic tweaks
2020-02-27 23:23:44 -06:00
Ghom
ebe16768d4
Merge pull request #11249 from Trilbyspaceclone/patch-298
...
Corrects bar stool name
2020-02-27 12:40:41 +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
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
Ghom
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +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
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
Ghom
213a406568
Merge pull request #11167 from Citadel-Station-13/kevinz000-patch-11
...
hand teles uses a (slightly) less atrocious sprite for the beam
2020-02-24 16:40:17 +01:00
kevinz000
8cf41997f5
Merge pull request #11201 from Hatterhat/bows
...
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
