3c973816d1
Ports https://github.com/tgstation/tgstation/pull/51125/
2020-05-27 12:48:25 +03:00
52ea19da84
adjustment
2020-05-27 00:33:09 -07:00
1c064e9b5a
appearance
2020-05-27 00:12:44 -07:00
dc3f02dbfb
let's make it pretty
2020-05-27 00:08:00 -07:00
88476273fd
almost ready
2020-05-26 23:46:15 -07:00
c877358340
Removes the immutable bit from the mining inquisitor/berserk hardsuits' slowdown.
2020-05-26 15:27:34 +02:00
0bfe77e15a
ok ( #12365 )
2020-05-26 15:24:23 +02:00
85186a9714
Porting updates related to material datums. ( #12317 )
...
* Porting updates related to material datums.
* art_type
* oh oh
2020-05-25 14:21:00 -07:00
e11908a357
Oranges and Paperwork can be picked up again. ( #12351 )
2020-05-25 14:20:10 -07:00
841bb86181
Fixing blindness stuff.
2020-05-25 16:10:25 +02:00
d04d6ae9eb
WIP
2020-05-25 15:06:31 +02:00
be02287dca
category + compile
2020-05-24 15:21:52 -07:00
79f7ba9ac5
keybindings
2020-05-24 15:10:11 -07:00
e4eb49050c
Merge remote-tracking branch 'citadel/master' into combat_rework
2020-05-24 15:03:06 -07:00
95c6c7345c
implementations
2020-05-24 14:56:01 -07:00
ad57647e64
Merge pull request #12173 from kevinz000/projectiles_2
...
Refactors projectile speed to pixels per second
2020-05-24 21:21:41 +00:00
a41a06bc4b
Fixing beam rifles lacking pin and pacifism checks. ( #12349 )
2020-05-24 13:29:45 -07:00
07df0102f8
Demodularizing a few reagents, a client var, the rest hud button. ( #12329 )
2020-05-24 13:21:14 -07:00
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
Artur