0a6b755eff
Apotechary chem dispenser nerf. ( #12292 )
...
* Apotechary chem dispenser nerf.
* Spelling and build_path.
2020-05-24 13:20:32 -07:00
c8cd97351d
Makes gun weight akimbo restrictions work the other way around. ( #12297 )
...
* Makes gun weight akimbo restrictions work the other way around.
* web edits
2020-05-24 13:19:28 -07:00
9fef1b62e1
Removing duplicate total item attack force modifiers. ( #12342 )
2020-05-24 13:12:44 -07:00
32135cc008
Makes bloodsuckers unguttable and undecappable ( #12335 )
...
* Bloodsuckers cant be gutted or beheaded anymore
* Mistakes were made
2020-05-24 13:08:18 -07:00
4fcb0451a1
Makes bloodsuckers unable to suck through thick clothing ( #12334 )
...
* Cant suck through hardsuits now can you
* Lets join in passive suck as well
* Bug fixings
2020-05-24 13:08:06 -07:00
6756b564b7
Removing that one keg. ( #12333 )
2020-05-24 13:07:53 -07:00
ba3151bf1e
Pills and pill bottles are now volumetric. ( #12332 )
2020-05-24 13:07:35 -07:00
ce1f1bdf5e
Turning a few components into elements. ( #12325 )
...
* Turning a few components into elements.
* eh
2020-05-24 13:06:27 -07:00
ab5d65a454
Porting the BEPIS research machinery. ( #12277 )
...
* Initial B.E.P.I.S port.
* All nodes but sticky tape are in. Sweet.
* Mapping the BEPIS :DDD
* ah
* deers.
2020-05-24 13:05:15 -07:00
a84e7bcecc
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765
2020-05-24 04:00:51 +02:00
e9068f05eb
let's play the optimization game featuring lighting ( #12310 )
...
* debug proc
* kinda quirky
* let's play the lighting game
* let's play the macro game
* let's play the refactor game
* let's play the optimization game
* let's play the optimization game x2
* yeehaw
* e
* let's play the memory game
* fix
* lighting fix
* sanitization and checks
* mh
* hotkeys fix
* ok
2020-05-23 22:47:42 +02:00
a6d7170d5b
Merge pull request #12313 from kevinz000/click_logs
...
[s]click logging
2020-05-23 20:21:45 +00:00
c857dc9cd1
Merge pull request #12321 from Ghommie/Ghommie-cit779
...
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
2020-05-22 21:36:00 +00:00
d03d20d570
Merge remote-tracking branch 'upstream/master' into snaxi2
2020-05-22 13:52:56 -05:00
00db2cdc64
Tempoary removal..
2020-05-22 19:33:31 +03:00
6a0426a094
Undefined procs...
2020-05-22 19:32:57 +03:00
04dcd6a02c
Dos2unix
2020-05-22 19:20:59 +03:00
2c670055b4
Forgot this
2020-05-22 17:31:45 +03:00
c5d86e9722
Removing HTML...
2020-05-22 17:29:20 +03:00
ff57c5a294
Fixes APC and makes sleeper work again
2020-05-22 16:44:21 +03:00
098b6642ae
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-22 16:19:17 +03:00
bcd911070a
Fixing dwarfism. ( #12331 )
...
* Update body.dm
* Update dwarves.dm
2020-05-21 12:38:42 -07:00
4ee5d0cb37
Merge pull request #12296 from kevinz000/paracoat
...
Adds a paramedic wintercoat
2020-05-21 19:26:31 +00:00
8dd4fd4e66
Actually fixes mesmerize ( #12330 )
2020-05-21 21:26:05 +02:00
8ca1bcd237
Merge pull request #12315 from DeltaFire15/styp-silsulf-OD-fix
...
Fixes Styptic Powder & SilverSulf OD effects
2020-05-21 19:22:28 +00:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
8a0ed38a58
Fixing a few issues with the nutrition adjustment proc and the circuit printer. ( #12320 )
2020-05-21 10:10:59 -07:00
e792600115
Update movement.dm ( #12327 )
2020-05-21 15:00:21 +02:00
0fbbd51418
Add the pie-cannon sound to the circuit version of the pneumatic cannon ( #12319 )
2020-05-21 14:55:25 +02:00
fcb2b58664
Upgrade able Medical bot and Floor bot as well! + Clean bot fix! ( #12112 )
...
* Misstake are now
* Still dosnt all work
* no more range upgrade it just dosnt work
* bithell
* a this
2020-05-20 19:03:20 -07:00
7337993d8e
Lavaland Gear Tweaks - Armor balancing ( #12270 )
...
* lava land tweaks
* Reverts Exo suit touches
5% isnt worth that much, so might as well give it back
* Update miscellaneous.dm
* Reverts the ERT based gear
2020-05-20 18:47:30 -07:00
3ac61c0704
Porting tg painting code. ( #12305 )
...
* Porting tg painting code.
* yes.
2020-05-20 18:45:36 -07:00
6696560656
slendermen fix. ( #12303 )
...
* slendermen fix.
* Whops
* Update dwarfism.dm
2020-05-20 18:43:14 -07:00
7f38e0714b
Skill calculation fixes, tweaks, antag and brain damage modifiers. ( #12302 )
...
* Skill calculation fixes, tweaks, antag and brain damage modifiers.
* Experience through patience.
* Priority Fix etcetera.
2020-05-20 18:42:58 -07:00
a7053a978f
Ports a tail from the RP server ( #12301 )
...
* tailse
* forgot to reorder it lol
* and i guess felinids and anthros can use it too
2020-05-20 18:37:38 -07:00
50171db408
Makes fermichem properly logged in the reagents logs, tiny astrogen fix.
2020-05-21 03:04:26 +02:00
dfcbee5045
Update pandemic.dm ( #12318 )
2020-05-21 02:34:09 +02:00
b57e1c1e93
Rebindable Hotkeys ( #12138 )
...
* demodularize interface
* keybindings
* binds
* prefs
* loose ends
* globals
* changes
* s
* datum ref lists
* ok
* fixes
* fixes
* fix
* ok
* sigh
* sigh
* indicators
* let's play the move code around game
* let's play the i didn't comma my lists game
* let's play the indent game
* let's play hte spelling bee
* let's fail the spelling bee
* LET'S PLAY THe HOW HARd IS IT TO SPELL A PROC GAME
* let's play the bugfix game
* bugfixes
* improvements
* Update bindings_client.dm
* pixel shift
* A
* wups
2020-05-20 23:40:20 +02:00
f73f5211f9
fixed converters.dm ( #12316 )
2020-05-20 23:38:15 +02:00
761d014f6f
fixes silver sulf and styptic OD effects
...
:)
2020-05-20 18:52:20 +02:00
89a14a82f0
ok
2020-05-20 07:46:58 -07:00
ed90c59d65
Removal of """silk""" ( #12221 )
...
* Removal of """silk"""
* AAA
* Ashwalkers now start with durathread seeds
2020-05-19 23:43:46 -07:00
bbbb4c611d
Fixes asset cache
2020-05-19 21:13:00 +03:00
ee66a2d396
Ports https://github.com/tgstation/tgstation/pull/50991/
2020-05-19 20:50:22 +03:00
a16f2df71c
Cleans up after oracleUI
...
Disablers paper for now until markdown paper is done
2020-05-19 20:34:45 +03:00
e00cafd7e4
Kills oracleUI
...
It wasnt being used anyways and it was conflicting with the new asset cache system
2020-05-19 19:03:45 +03:00
c73295279e
Fixes asset cache client
2020-05-19 19:02:46 +03:00
c0881fb222
Ports https://github.com/tgstation/tgstation/pull/50759
2020-05-19 18:43:41 +03:00
fc921289d6
Merge pull request #12149 from kevinz000/DMAPI5
...
Updates DMAPI to v5
2020-05-19 22:32:17 +12:00
fc77954be3
Merge pull request #12290 from Ghommie/Ghommie-cit767
...
Certain cargo packs (mostly armory/security) can not be privately purchased anymore.
2020-05-19 05:15:12 +00:00
Ghom