Commit Graph

12930 Commits

Author SHA1 Message Date
r4d6
a8403cb072 Make Dwarves heal from Plump Helmet 2020-02-08 22:40:17 -05:00
Trilbyspaceclone
d49a53e193 Update costumes_toys.dm 2020-02-08 22:17:58 -05:00
Ghom
2a0ba12896 Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
gun qdel fix
2020-02-09 02:53:38 +01:00
Trilbyspaceclone
1e2562ed02 Update organic.dm 2020-02-08 18:59:00 -05:00
Ghommie
98a525568f Ok. 2020-02-08 23:59:20 +01:00
Ghommie
3485d82dd0 salty digi man bad. 2020-02-08 23:58:05 +01:00
TrilbySpaceClone
e5236eebb1 hey lets do corrections 2020-02-08 17:39:00 -05:00
Ghom
0bbf1efa67 Merge pull request #10762 from kevinz000/one_last_taser_attempt
One last attempt at balancing tasers (and some adv egun stuff)
2020-02-08 23:30:41 +01:00
IHOPMommyLich
860c8136df Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals. 2020-02-08 17:01:12 -05:00
Ghommie
eaa6bc2db5 fixing another issue with the hear comsig proc. 2020-02-08 19:37:18 +01:00
Putnam
611c850639 all you need to understand is everything you know is wrong 2020-02-08 00:31:46 -08:00
TrilbySpaceClone
612b5c5da3 better name 2020-02-08 03:27:43 -05:00
TrilbySpaceClone
5dbfc9a514 Yay 2020-02-08 03:25:09 -05:00
Seris02
0b1cb9db6d timer'd 2020-02-08 15:25:11 +08:00
Detective Google
6e969808f3 capitalization is FUN! 2020-02-08 00:53:22 -06:00
kevinz000
c6c1cc484c slight buff 2020-02-07 23:40:02 -07:00
kevinz000
826ed7d4f2 o k. 2020-02-07 23:39:09 -07:00
kevinz000
7c16830e91 ok 2020-02-07 23:31:38 -07:00
Ghom
890274ce87 Update ai.dm 2020-02-08 05:08:06 +01:00
kevinz000
f8d5eae0c3 Update gravity.dm 2020-02-07 16:24:12 -07:00
kappa-sama
8c2019fcbf probably fixes plant disk techdisk 2020-02-07 17:58:36 -05:00
Detective Google
f145b8c0b5 Merge remote-tracking branch 'upstream/master' into the-p-o-o-l 2020-02-07 16:28:47 -06:00
Ghom
71f44a7085 Merge pull request #10892 from kevinz000/small_guncode_refactor
Small guncode refactor but it works
2020-02-07 23:13:21 +01:00
Lin
5717700146 Merge pull request #10925 from Ghommie/Ghommie-cit558
runtime is forever, errors are eternal.
2020-02-07 17:29:49 +00:00
Ghom
0e778fc2be Merge pull request #10956 from Arturlang/bloodsucker_cloak_fix
[s]Fixes bloodsucker cloak
2020-02-07 13:29:21 +01:00
Artur
41eebc6e2b Fixes cloak 2020-02-07 13:42:56 +02:00
kevinz000
673079f995 Update gravity.dm 2020-02-07 03:31:15 -07:00
kevinz000
b5d6afac9a Update gravity.dm 2020-02-07 03:20:45 -07:00
kevinz000
0337a6402b Update wizard.dm 2020-02-07 03:16:52 -07:00
Ghom
2ebf758347 Merge pull request #10950 from Citadel-Station-13/kevinz000-patch-9
beam rifle sanity update
2020-02-07 10:17:14 +01:00
Seris02
4ec99a38e2 merge fixes 2020-02-07 15:28:05 +08:00
kevinz000
4f2acb6298 Update gun.dm 2020-02-07 00:08:19 -07:00
Ghommie
7362b89aeb More stuff. 2020-02-07 08:04:07 +01:00
kevinz000
15a59dd729 Merge pull request #10921 from Ghommie/Ghommie-cit557
Lavaland's Herald speech fix.
2020-02-06 23:56:13 -07:00
kevinz000
de2a3c5502 Merge pull request #10787 from Seris02/snatchgloves
thief's gloves
2020-02-06 23:53:54 -07:00
kevinz000
3f5805a9e8 Merge pull request #10798 from necromanceranne/secmainsrejoice
Formal security wear are now armor vests (HAS SOME BALANCE CONCERNS)
2020-02-06 23:52:49 -07:00
kevinz000
ae199cee28 Update beam_rifle.dm 2020-02-06 23:49:36 -07:00
kevinz000
353c13631a Update beam_rifle.dm 2020-02-06 23:34:33 -07:00
Ghom
e7e13e99b8 Update apc.dm 2020-02-07 07:32:06 +01:00
Ghom
fc1c97b6c6 [s] Prevents some unachievable discounts. 2020-02-07 06:11:20 +01:00
kevinz000
7f81f3e51f fix 2020-02-06 22:00:30 -07:00
Ghommie
83a08ee9f5 Extras and tg#45018 2020-02-07 05:21:08 +01:00
Ghommie
2d8f85d810 A few nuisances solved. 2020-02-07 02:59:59 +01:00
Ghommie
cd339348c9 Also an unwarranted underscore. 2020-02-07 01:22:32 +01:00
kevinz000
62b0e62952 Merge pull request #10623 from Putnam3145/antag-overhaul
Better antag objectives: for real this time
2020-02-06 16:25:22 -07:00
Ghommie
04261345dd export scanners. 2020-02-06 23:08:32 +01:00
Ghommie
0703c6eea6 First tweak to cargo reagents selling. 2020-02-06 22:34:54 +01:00
Ghom
cd14f13d0d Merge pull request #10917 from Arturlang/Hyposprays_QOL
Removes the hypospray verb for toggling spray/inject mode and makes it into an Alt click proc.
2020-02-06 20:31:46 +01:00
Artur
c9dc35fd9a Updates the debug outfit 2020-02-06 18:42:23 +01:00
kevinz000
57f6ad5e87 Update login.dm 2020-02-06 05:46:31 -07:00