Artur
|
3154e8c596
|
Updates components to TG and fixes can
|
2020-07-06 10:58:48 +03:00 |
|
Artur
|
7ebc785437
|
fIXES UPLINK
|
2020-07-05 21:52:24 +03:00 |
|
Artur
|
a304ed7f49
|
Canister and paper updates
should fix papah exploits, though some runtiming is occuring
|
2020-07-04 16:14:42 +03:00 |
|
Artur
|
f0154f3f1c
|
conflicts!!!
|
2020-07-03 15:45:11 +03:00 |
|
Artur
|
82c6a02feb
|
More Testmerge fixes
|
2020-07-03 15:34:45 +03: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 |
|
silicons
|
824d11b085
|
death to lists
|
2020-07-03 02:34:59 -07:00 |
|
silicons
|
d85edbf8fb
|
ok
|
2020-07-03 02:15:06 -07:00 |
|
Artur
|
7781296fb9
|
DNA CONSOLE FIX
|
2020-07-03 11:09:55 +03: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 |
|
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
|
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
|
9ae040b904
|
Merge pull request #12657 from bunny232/witchhunterhat
Witch hunter hat tweak.
|
2020-07-02 01:48:19 -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 |
|
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
|
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 |
|
Lin
|
fa1e92d588
|
Merge pull request #12656 from Ghommie/Ghommie-cit826
Fixing two handed items and etcetera.
|
2020-07-01 14:30:16 -05:00 |
|
Ghom
|
aaffe3ec12
|
Merge pull request #12647 from zeroisthebiggay/fuckfuckfuckfuck
attempts to port Wizard Gamemode now ends when all wizards and wizard apprentices are dead #47514
|
2020-07-01 19:46:16 +02:00 |
|
Ghommie
|
f7de8034a1
|
Put an end to the null stack traces from icon2html's register_asset.
|
2020-07-01 19:26:09 +02:00 |
|
Ghommie
|
94f7dae62e
|
Porting "Fix asset cache verification" and other tiny bits.
|
2020-07-01 16:24:12 +02:00 |
|
Ghom
|
8de00e80dd
|
Update bag_of_holding.dm
|
2020-07-01 15:04:51 +02:00 |
|
Letter N
|
b35e3f2b93
|
fix: R&D Console, Vending, and chem master
|
2020-07-01 19:07:03 +08:00 |
|
silicons
|
8f30d7f4d1
|
Update code/datums/components/storage/concrete/bag_of_holding.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
|
2020-06-30 20:27:30 -07:00 |
|
bunny232
|
afe9b2dfbd
|
Update holy_weapons.dm
|
2020-06-30 11:15:40 -04:00 |
|
Ghommie
|
cd1c5511a4
|
Fixing two handed items and etcetera.
|
2020-06-30 16:24:04 +02:00 |
|
Artur
|
e6dee77b79
|
Telecomms fixes
|
2020-06-30 17:01:54 +03:00 |
|
Artur
|
fa6386f1a9
|
Skills and clockwork build
|
2020-06-30 16:08:31 +03:00 |
|
silicons
|
837a77585c
|
Update bag_of_holding.dm
|
2020-06-30 00:41:09 -07:00 |
|
Artur
|
20245f7319
|
Merge remote-tracking branch 'origin/master' into TGUI-3.0
|
2020-06-30 02:30:29 +03:00 |
|
zerothebigboy
|
40c515b383
|
i hope this works
|
2020-06-29 19:13:26 -04:00 |
|
Ghommie
|
9dc4b99620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
|
2020-06-30 00:49:06 +02:00 |
|
Ghom
|
3c4a288ecc
|
Merge pull request #12625 from Citadel-Station-13/silicons-patch-9
maybe fixes edge cases where half the server has their client input system broken
|
2020-06-30 00:21:42 +02:00 |
|
Artur
|
2797aefc3a
|
Clockworkslab and ui resizing
|
2020-06-30 01:05:43 +03:00 |
|