Ghom
7a2e0892d3
Merge pull request #11277 from kevinz000/sword_point
...
En garde! (nah just sword pointing)
2020-03-04 17:11:39 +01:00
Ghom
a2fe9f0d23
Update toys.dm
2020-03-04 17:03:26 +01:00
Ghom
0b74bc9da3
Update twohanded.dm
2020-03-04 16:43:57 +01:00
Ghom
7c8b490cb3
Update energy.dm
2020-03-04 16:40:28 +01:00
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
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
kevinz000
18bdb753d3
bet
2020-03-03 21:13:59 -07:00
kevinz000
0cf7f2e882
Update energy.dm
2020-03-03 21:07:24 -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
83ec1e428c
Merge remote-tracking branch 'upstream/master' into Kat-Furniture
2020-03-03 13:48:18 +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
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
Lin
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -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
kevinz000
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07: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
kevinz000
626cf886d6
Update twohanded.dm
2020-02-26 05:31:47 -07:00
Ghom
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +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
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
kevinz000
0cfa6699b1
yeah ok fine
2020-02-24 02:31:14 -07:00
kevinz000
ae6c388510
Merge pull request #11214 from Citadel-Station-13/Ghommie-patch-3
...
Fixing pAI radios inability to be toggled on/off
2020-02-24 02:23:30 -07:00
kevinz000
73c03adbbb
Merge pull request #11199 from Detective-Google/pai.pai.pai.png
...
Lets pAIs hold encryption keys and play music.
2020-02-24 02:23:17 -07:00
kevinz000
e76eff6966
Update plushes.dm
2020-02-24 02:21:51 -07:00
kevinz000
27b7cd560c
Update plushes.dm
2020-02-24 01:32:04 -07:00
Ghom
825beb41c1
Update paicard.dm
2020-02-23 22:44:38 +01:00
Ghom
b3149d930f
Fixing pAI radios inability to be toggled on/off
2020-02-23 21:31:53 +01:00
Hatterhat
accc4ce776
grammar shit, silkstring buff, arrow costs, yikes
2020-02-22 15:33:07 -06:00
Hatterhat
75a5a6cd45
ellipses. dot dot dot.
2020-02-22 15:21:12 -06:00
Hatterhat
2d29b37ce9
slab spawns and grammar shidd
2020-02-22 15:14:09 -06:00
Detective Google
ca29246878
adds the loudness booster(instruments) and Encryption key slot to pAIs. (lazy tg port 2.)
2020-02-22 00:02:49 -06:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Winter Flare
79967b0ac5
Resolving some convos.
...
Rename Pastries to Pastry & Sweets
Move all sweets to Pastry & Sweets
Revert Weight Class Changes
Add Whitelist to trays. Glasswear, Drinks, Foods, Kitchen Items, ect.
Move Brioche Cake item/recipe
Move Scotch Egg item/recipe
2020-02-21 07:16:39 -05:00
