Ghom
|
7b877eb9e0
|
Merge pull request #11832 from Seris02/storagewhitelist
adds extra functionality to storage whitelists
|
2020-04-25 02:50:56 +02:00 |
|
Ghom
|
5ccdc55e42
|
Merge pull request #11979 from kevinz000/magnetic_harness
Cybernetic arm implant balance pass (namely: shields)
|
2020-04-25 02:47:28 +02:00 |
|
Ghom
|
f01cb896e5
|
Apply suggestions from code review
|
2020-04-25 02:43:56 +02:00 |
|
Ghom
|
c8c5073c35
|
Merge pull request #11981 from Hatterhat/10mm-doesnt-have-a-dot-in-front-idiot
10mm doesnt have a dot in the caliber name bro
|
2020-04-25 02:31:28 +02:00 |
|
kevinz000
|
cf61795101
|
Merge pull request #11941 from kiwedespars/punch-bundle
re-adds north star gloves to traitors for 20 tc
|
2020-04-23 11:45:04 -07:00 |
|
kevinz000
|
6a5e286ed2
|
Merge pull request #11942 from Trilbyspaceclone/cube-world
Cube world, aka - More dehydrated cubes! Modular Cubes and more!
|
2020-04-23 11:44:48 -07:00 |
|
kevinz000
|
45319b4942
|
Merge pull request #11976 from Citadel-Station-13/Ghommie-patch-1
Updates ammo_box/update_icon() to nowadays standards.
|
2020-04-23 11:41:51 -07:00 |
|
Ghom
|
e4c6df71fc
|
Update tacklers.dm
|
2020-04-23 14:35:36 +02:00 |
|
TrilbySpaceClone
|
c8b3032087
|
Merge branch 'master' into cube-world
|
2020-04-23 02:04:56 -04:00 |
|
kevinz000
|
c43f4e2e5e
|
Update tacklers.dm
|
2020-04-22 22:27:48 -07:00 |
|
kevinz000
|
af222768fe
|
Revert "Update tacklers.dm"
This reverts commit b6a47a06ed.
|
2020-04-22 22:27:17 -07:00 |
|
kevinz000
|
b6a47a06ed
|
Update tacklers.dm
|
2020-04-22 22:26:39 -07:00 |
|
kevinz000
|
529a8e52c7
|
Merge pull request #11960 from Trilbyspaceclone/patch-352
Theirs a snake in my boot...
|
2020-04-22 18:42:46 -07:00 |
|
kevinz000
|
1236e11eca
|
Merge pull request #11950 from Citadel-Station-13/Ghommie-patch-3
Fixing a little mistake with a config.
|
2020-04-22 18:41:21 -07:00 |
|
kevinz000
|
411622430f
|
Merge pull request #11985 from Ghommie/Ghommie-cit701
Removal of backward 512 compatibility.
|
2020-04-22 18:40:41 -07:00 |
|
Ghommie
|
42201343a9
|
Backward 512 compatibility removal.
|
2020-04-23 00:59:23 +02:00 |
|
Trilbyspaceclone
|
511465ed7b
|
Update shields.dm
|
2020-04-22 18:13:09 -04:00 |
|
Hatterhat
|
2126ca1674
|
dot on casing name gone
|
2020-04-22 15:41:22 -05:00 |
|
Lin
|
7f271157c3
|
Merge pull request #11929 from Ghommie/Ghommie-cit692
Shielded Component
|
2020-04-22 20:33:12 +00:00 |
|
Ghom
|
63362f74c9
|
Merge pull request #11912 from Seris02/betteruipref
toggle for tetris bags
|
2020-04-22 22:26:40 +02:00 |
|
kevinz000
|
e4e2c0195c
|
epic
|
2020-04-22 12:04:47 -07:00 |
|
kevinz000
|
fe63eca817
|
kay
|
2020-04-22 11:04:01 -07:00 |
|
kevinz000
|
c551006295
|
catch dropped
|
2020-04-22 10:54:42 -07:00 |
|
kevinz000
|
3626cc5d28
|
okay
|
2020-04-22 10:50:03 -07:00 |
|
kevinz000
|
467497af54
|
woops
|
2020-04-22 10:45:13 -07:00 |
|
kevinz000
|
3e09ee8328
|
Alright
|
2020-04-22 10:42:11 -07:00 |
|
Lin
|
df4452468a
|
Merge pull request #11932 from Ghommie/Ghommie-cit695
Some mispelled filepaths.
|
2020-04-22 16:09:33 +00:00 |
|
Lin
|
20f2d5d961
|
Merge pull request #11964 from Citadel-Station-13/Ghommie-patch-2
Makes the human form ling power work again.
|
2020-04-22 16:07:49 +00:00 |
|
Ghom
|
0c15c09e48
|
Update _box_magazine.dm
|
2020-04-22 16:30:30 +02:00 |
|
Seris02
|
39199a3a79
|
there
|
2020-04-22 12:31:55 +08:00 |
|
Ghom
|
6467cc9647
|
Merge pull request #11958 from Putnam3145/ling-kill-once
Makes ling kill objectives kill-once
|
2020-04-22 04:05:06 +02:00 |
|
Lin
|
4c83af2cc2
|
Merge pull request #11953 from kevinz000/shieldbash2
Fixes shield bashing
|
2020-04-22 01:51:57 +00:00 |
|
Ghom
|
aab62f196d
|
Merge pull request #11954 from Trilbyspaceclone/patch-350
Makes medical hardsuits a smig faster
|
2020-04-22 03:32:07 +02:00 |
|
Ghom
|
9b27f1f6ec
|
Merge pull request #11922 from Trilbyspaceclone/patch-345
Nerfs most soda and reagents
|
2020-04-22 03:31:32 +02:00 |
|
Ghom
|
1a9bcddc61
|
Merge pull request #11938 from Owai-Seek/crab-meat-4-19-2020
Ups Crab Meat from 1 to 4
|
2020-04-22 03:31:19 +02:00 |
|
Lin
|
3483ab7947
|
Merge pull request #11957 from Ghommie/Ghommie-cit696
Fixing CE jump suit/skirt and accessory overlays.
|
2020-04-21 22:17:16 +00:00 |
|
kevinz000
|
2c08b7847e
|
Merge pull request #11967 from Putnam3145/fix-the-damn-tesla-delams
Replaces, a ^ in supermatter calculations with **
|
2020-04-21 14:00:13 -07:00 |
|
Putnam3145
|
45f032a600
|
Merge pull request #11854 from Citadel-Station-13/Ghommie-patch-1
Something about configs and integers.
|
2020-04-21 13:04:31 -07:00 |
|
Putnam
|
a9600cffaa
|
Replaces a xor with a power??
|
2020-04-21 13:01:50 -07:00 |
|
Ghommie
|
824904844c
|
Componentized for sanity.
|
2020-04-21 19:51:44 +02:00 |
|
Ghom
|
5a6a205b9d
|
Merge pull request #11868 from Arturlang/tackling_and_lunge
Ports TG Tackling and uses it to rework bloodsucker lunge
|
2020-04-21 15:50:44 +02:00 |
|
Ghom
|
a475355c93
|
Update humanform.dm
|
2020-04-21 15:28:12 +02:00 |
|
kevinz000
|
055606b81b
|
Revert "Update SDQL_2_wrappers.dm"
This reverts commit 685546551c.
|
2020-04-20 20:27:18 -07:00 |
|
kevinz000
|
685546551c
|
Update SDQL_2_wrappers.dm
|
2020-04-20 20:26:50 -07:00 |
|
Lin
|
560cf8749b
|
Merge pull request #11943 from Citadel-Station-13/Ghommie-patch-2
Ports text formatted round timer from skyrat.
|
2020-04-21 02:13:31 +00:00 |
|
Trilbyspaceclone
|
6dd89ec1e0
|
Update pockets.dm
|
2020-04-20 21:50:25 -04:00 |
|
Ghom
|
79eb0f5838
|
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
Fixes Crafting menu
|
2020-04-21 01:25:46 +02:00 |
|
TrilbySpaceClone
|
c3fc133282
|
*crys*
|
2020-04-20 18:28:57 -04:00 |
|
TrilbySpaceClone
|
58cb5e391e
|
*scream*
|
2020-04-20 18:22:13 -04:00 |
|
Ghom
|
50eae569eb
|
Merge pull request #11940 from Detective-Google/null-roddies
Turns chaplain null rod selection into a radial function(port TG#50512)
|
2020-04-20 23:53:24 +02:00 |
|