Ghommie
e3b1ca4942
Linter.
2020-07-03 19:57:38 +02:00
Ghommie
bde80eb1fb
Fixing obscured inventory slots (un)equip block, for real.
2020-07-03 19:02:20 +02:00
Winter Flare
870bb8f804
Actual BLT Stuff
...
This is why I test things. Also, I shouldn't do this before I try to sleep.
2020-07-03 09:48:35 -04:00
Winter Flare
bef462b4ae
BLT Sandwich
2020-07-03 08:50:54 -04:00
Artur
f0154f3f1c
conflicts!!!
2020-07-03 15:45:11 +03:00
Winter Flare
5b923623d3
Sprite Updates + Food Ports
...
Ports/Adds, or updates the sprites for:
Cooked Carp
Bear Steaks
Raw and Cooked Chicken
Raw Meatball (Unused, adding for future PR)
Ports:
Chili Cheese Fries
Margarine
BLT (In next Commit)
Fix:
Tuna Sandwich now uses 5u Mayo, instead of 5 jars of mayo.
Tuna Sandwich is now visible.
2020-07-03 08:33:01 -04:00
Artur
6c4e733a38
More testmerge fixes
2020-07-03 15:16:02 +03:00
Artur
0d9609af29
Fixes SMES
2020-07-03 13:36:18 +03:00
kappa-sama
05591ee04c
better
2020-07-03 05:40:18 -04:00
silicons
d85edbf8fb
ok
2020-07-03 02:15:06 -07:00
silicons
a738d52740
oh god oh FUCK
2020-07-03 00:11:09 -07:00
Ghommie
f5ffd7d2a9
Easing fine tuning of the system.
2020-07-03 03:00:33 +02:00
Ghommie
92c846fdbf
Improvements to the recent clothing menu toggle hardsuit helmet feature.
2020-07-03 01:08:28 +02:00
Ghom
50716ee393
Merge pull request #12668 from Arturlang/strip_menu_helmet
...
Hardsuit strip menu helmet toggle
2020-07-03 00:41:03 +02:00
Ghom
7370b7c687
Merge pull request #12671 from Sonic121x/patch-2
...
Fix Pilltype button (for real this time).also fix technode icon missing.
2020-07-03 00:26:28 +02:00
Ghommie
6fc584518a
Fixing (un)equip penalties from obscured inv slots.
2020-07-03 00:07:30 +02:00
Artur
365aadec54
Trying to fix the dna t
2020-07-03 00:55:18 +03:00
Artur
6ee1eba56c
Merge remote-tracking branch 'origin/master' into TGUI-3.0
2020-07-02 23:23:47 +03:00
Artur
f46d0b9409
Clockworkslab, skillpanel, telecoms works now
2020-07-02 23:21:11 +03:00
Ghom
e586d03e0a
text spans.
2020-07-02 19:47:05 +02:00
Ghom
c919075aca
Thanks Timothy.
2020-07-02 19:46:10 +02:00
Ghom
4354b0bf6f
Actually fixing a dum dum feature.
2020-07-02 19:26:52 +02:00
Sonic121x
4ca695020a
add adigitigrade version of captain's female formal outfit.
2020-07-02 23:21:31 +08:00
Sonic121x
6240ade87d
Add digitigrade version of cmoturtleneck
2020-07-02 23:20:01 +08:00
Sonic121x
4e2b05a22a
Fix the missing Technode icon
2020-07-02 22:33:35 +08:00
Sonic121x
ea7fed0c8e
givme that pilltype button
...
Fix pill type button
2020-07-02 22:30:28 +08:00
Ghom
ef60068f1c
Merge pull request #12666 from timothyteakettle/more-blood-fixes
...
More blood fixes
2020-07-02 14:52:39 +02:00
silicons
5f11612078
Update preferences_savefile.dm
2020-07-02 03:00:35 -07:00
silicons
bb67ab5ddd
Merge pull request #12664 from Ghommie/Ghommie-cit827
...
Porting a few asset cache related PRs.
2020-07-02 01:49:27 -07:00
silicons
7b99e69583
Merge pull request #12661 from LetterN/cool-fucked-up-another-master-branch-fixes-assetthing
...
Fix broken UI icons
2020-07-02 01:46:14 -07:00
silicons
3f1119fcdb
Merge pull request #12630 from Ghommie/Ghommie-cit822
...
You can't (un)equip garments on/from obscured inventory slots anymore.
2020-07-02 01:44:59 -07:00
silicons
cbad654371
Merge pull request #12632 from Ghommie/Ghommie-cit823
...
Ups melee stam cost multiplier from 0.8 back to 1, made stam cost for throwing mobs scale with mob_size
2020-07-02 01:44:09 -07:00
silicons
9abeb9c07e
Merge pull request #12631 from Citadel-Station-13/Ghommie-patch-1
...
Nerfing shaft miners' paycheck.
2020-07-02 01:43:53 -07:00
silicons
e2975a44a1
Merge branch 'master' into policy
2020-07-02 01:23:19 -07:00
Artur
2931c03ccb
Ghommie fixes
...
strongDMM autofixed wildest, hopefully it didnt break anything
2020-07-02 01:48:28 +03:00
Artur
582d672109
Hardsuit strip menu helmet toggle
2020-07-02 01:31:15 +03:00
Timothy Teakettle
15e137dd18
Merge branch 'master' into tray-and-jar
2020-07-01 22:06:17 +01:00
Timothy Teakettle
84d60a455e
wow its still spelt wrong
2020-07-01 21:53:34 +01:00
Timothy Teakettle
1cb1b4d7e6
oh my god its not even defined right
2020-07-01 21:29:10 +01:00
Timothy Teakettle
311e149562
fix bloodpacks
2020-07-01 21:00:01 +01:00
Ghommie
94f7dae62e
Porting "Fix asset cache verification" and other tiny bits.
2020-07-01 16:24:12 +02:00
kappa-sama
cfc14a04f1
Merge branch 'master' into patch-28
2020-07-01 07:48:46 -04:00
kappa-sama
1f38c3029c
yeah ok
2020-07-01 07:40:43 -04:00
Letter N
b35e3f2b93
fix: R&D Console, Vending, and chem master
2020-07-01 19:07:03 +08:00
YakumoChen
8e25b90d54
removes obselete part
2020-07-01 09:08:01 +00:00
YakumoChen
327a36f8bd
removes obselete autolathe designs
2020-07-01 09:06:29 +00:00
YakumoChen
67b5efbce0
Update pistol.dm
2020-07-01 09:03:48 +00:00
kappa-sama
e03112d1dc
these
2020-07-01 04:59:59 -04:00
YakumoChen
346007b4fb
Update beams.dm
2020-07-01 08:58:27 +00:00
YakumoChen
a3961a642c
removes improv laser
2020-07-01 08:57:48 +00:00
