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
1e99cd0bfe
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-03-03 03:08:41 -07:00
c21bd60929
fix
2020-03-03 03:04:23 -07:00
f08d79767b
Removes makeshift switchblades
2020-03-02 19:33:31 +01:00
50a1feeb89
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties
2020-03-02 17:38:08 +01:00
92e95f816a
Update defib.dm
2020-03-02 03:49:21 -07:00
41e4de9287
fixes telebatons runtiming and not being able to be extended
2020-03-02 02:47:21 +01:00
508511cb86
actually makes contractor pinpointer do things
2020-03-02 01:36:11 +01:00
7206e5ee6e
nearly forgot these as well
2020-03-01 23:31:14 +01:00
efaa99ae27
some dozens lines about PDA/update_overlays and cryopods/MMIs.
2020-03-01 23:17:35 +01:00
e3c77f2f5a
part 4: the one where i slowly go insane
2020-03-01 22:05:35 +01:00
ab48a6fa16
part 3: do people even read commit logs
2020-03-01 19:14:05 +01:00
d93ade7e03
part 2: bloody tendency
2020-03-01 17:37:18 +01:00
38f7821dd6
part 1: battle stream
2020-03-01 16:56:13 +01:00
d817442f02
It works!
...
Everything works now.
2020-03-01 13:42:14 +00:00
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
71c26c287e
Update sheet_types.dm
2020-03-01 01:55:03 -05:00
5c2bf70fe7
Update code/game/objects/items/shields.dm
...
Co-Authored-By: Arturlang <arturpaavooskari.lang@gmail.com >
2020-03-01 00:48:45 -05:00
612f8d97d5
Update sheet_types.dm
2020-02-29 03:29:08 -05:00
d32cc370ad
Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1
...
Broom shenanigeans.
2020-02-29 00:22:24 -06:00
ba55351e4a
Update twohanded.dm
2020-02-28 13:43:11 -07:00
93d91b1808
Merge remote-tracking branch 'citadel/master' into sword_point
2020-02-28 13:39:56 -07:00
8ef68fa36b
En garde!
2020-02-28 13:35:41 -07:00
d5c2c54f32
Update fancy.dm
2020-02-28 19:14:58 +01:00
e39d7fa49d
Merge pull request #11259 from Ghommie/Ghommie-cit590
...
Porting update_icon improvements.
2020-02-28 04:30:12 -07:00
56eab760fc
Merge remote-tracking branch 'citadel/master' into mobility_flags
2020-02-27 20:11:36 -07:00
045d5b2dbf
fixes
2020-02-27 20:06:52 -07:00
a99e9ec2ff
Ok
2020-02-27 02:15:03 +01:00
b5f472c6dd
thank you dreamchecker
2020-02-27 01:47:18 +01:00
fc76cd9a9b
Porting update_icon improvements. Part 1.
2020-02-27 01:21:03 +01:00
626cf886d6
Update twohanded.dm
2020-02-26 05:31:47 -07:00
5bd62d129f
Merge pull request #10877 from kevinz000/staves
...
Riot Electrostaves
2020-02-25 20:32:36 +01:00
b8fa0c0977
Merge pull request #11217 from Citadel-Station-13/kevinz000-patch-12
...
plushies now use SAFEPICK
2020-02-25 14:31:07 +01:00
bfb8139225
DefaultCombatknockdown
2020-02-25 03:18:37 -07:00
00c70acee9
Target wew
2020-02-24 13:20:12 -07:00
26b908f53d
thonk
2020-02-24 13:19:38 -07:00
90d7fd81b1
k
2020-02-24 13:17:08 -07:00
fa9e275237
k
2020-02-24 13:16:12 -07:00
59e95555bb
Merge remote-tracking branch 'citadel/master' into staves
2020-02-24 13:09:45 -07:00
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
525cedf16a
this just works
2020-02-24 11:45:47 -05:00
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
8cf41997f5
Merge pull request #11201 from Hatterhat/bows
...
really just a lot of shit about bows
2020-02-24 02:33:54 -07:00
0cfa6699b1
yeah ok fine
2020-02-24 02:31:14 -07:00
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
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
e76eff6966
Update plushes.dm
2020-02-24 02:21:51 -07:00
27b7cd560c
Update plushes.dm
2020-02-24 01:32:04 -07:00
825beb41c1
Update paicard.dm
2020-02-23 22:44:38 +01:00
b3149d930f
Fixing pAI radios inability to be toggled on/off
2020-02-23 21:31:53 +01:00
KathrinBailey