KathrinBailey
11750b4fa9
removed redundant icon line
2020-03-04 14:16:27 +00:00
KathrinBailey
97733e464d
ghommie change and armrest bug fix
2020-03-04 01:35:00 +00: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
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 and GitHub
f9a2326437
Merge pull request #11203 from Trilbyspaceclone/poster
...
Three new posters!
2020-03-03 13:29:54 +01:00
Lin and GitHub
fde24492b9
Merge pull request #11294 from Ghommie/Ghommie-cit596
...
An old oversight with disease/var/viable_mobtypes.
2020-03-02 18:31:25 -06:00
Ghom and GitHub
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 and GitHub
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
ancientpower
56ba8ef127
requested changes
2020-03-01 12:45:00 -06:00
Ghommie
c0ff43f827
ofc, New arguments.
2020-03-01 16:34:43 +01:00
Ghommie
b0922dd70d
Actually..
2020-03-01 16:02:58 +01:00
KathrinBailey
d817442f02
It works!
...
Everything works now.
2020-03-01 13:42:14 +00:00
Ghom and GitHub
3ec80872f0
Merge pull request #11279 from Hatterhat/tg-45232-lavariver
...
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
2020-03-01 13:55:03 +01: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
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 and GitHub
5c5ec541ae
Merge branch 'master' into paramedic-tweaks
2020-02-29 01:55:46 -06:00
Hatterhat
727ec433f3
funny story my byond crashes every compile
2020-02-29 01:47:59 -06:00
Lin and GitHub
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
Lin and GitHub
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 and GitHub
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
kevinz000 and GitHub
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
Ghom and GitHub
ebe16768d4
Merge pull request #11249 from Trilbyspaceclone/patch-298
...
Corrects bar stool name
2020-02-27 12:40:41 +01:00
kevinz000 and GitHub
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 and GitHub
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 and GitHub
6e25a34aaa
Merge pull request #11257 from Linzolle/pacifist-spike
...
pacifists can no longer meatspike
2020-02-27 01:18:57 +01:00
Ghom and GitHub
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 and GitHub
2c642d5507
Update kitchen_spike.dm
2020-02-27 01:10:38 +01:00
Lin and GitHub
69e3d857a8
derp
2020-02-26 21:39:53 +00:00
Lin and GitHub
ac384e4d70
consistency?
2020-02-26 21:01:34 +00:00
Lin and GitHub
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 and GitHub
626cf886d6
Update twohanded.dm
2020-02-26 05:31:47 -07:00
Trilbyspaceclone and GitHub
7fe6ebb2c9
Update chair.dm
2020-02-26 00:24:09 -05:00
Ghom and GitHub
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +01:00
Ghom and GitHub
5ee2f0dcd8
Merge pull request #11169 from PersianXerxes/ohHeyKilo
...
Ports Kilo Station from Skyrat
2020-02-25 14:48:37 +01:00
Ghom and GitHub
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 and GitHub
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
KathrinBailey