Commit Graph

15183 Commits

Author SHA1 Message Date
Linzolle 4622f66162 for real this time 2020-02-09 19:45:22 -06:00
Hatterhat d24afcde1b pb burst from 60 to 81 2020-02-09 19:07:24 -06:00
Ghom 33688dbe93 Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
Nerfing Stimulants
2020-02-09 23:56:52 +01:00
Ghom 3a2eb8c1ad Update experimental_dissection.dm 2020-02-09 22:50:43 +01:00
Ghom c7614958bc Merge pull request #10937 from Arturlang/debug_outfit_updates
Updates the debug outfit
2020-02-09 22:49:22 +01:00
Ghom 0f2f5ab639 Merge pull request #10936 from Citadel-Station-13/kevinz000-patch-7
Cyborging someone will now be able to force-remove gang lead status, much like how it can force-deantag headrevs and bloodsuckers
2020-02-09 21:38:50 +01:00
Ghom 101640170b Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
repulse sanity
2020-02-09 21:09:00 +01:00
Arturlang 29207b22fb Merge branch 'master' into debug_outfit_updates 2020-02-09 22:05:26 +02:00
r4d6 e4f2af2d77 compile 2020-02-09 07:34:21 -05:00
r4d6 9ba0a1b470 Code update 2020-02-09 07:21:47 -05:00
Ghom bcbaea4a7b CallMaterialName reagent fix 2020-02-09 10:46:29 +01:00
Seris02 83813d24c8 forgot that shit again 2020-02-09 17:07:39 +08:00
Seris02 577cfdc582 yay much better 2020-02-09 17:04:17 +08:00
YakumoChen 1c24797de1 revert 10486 2020-02-09 06:41:13 +00:00
Ghommie f6adce72fb Something about missing private sprites and their bad code. 2020-02-09 06:51:57 +01:00
Seris02 366075b38e yeet forgot this 2020-02-09 13:10:28 +08:00
Seris02 99147003ed wall walking boooooooooooooooots 2020-02-09 13:07:04 +08:00
r4d6 e6398815b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf 2020-02-08 23:23:28 -05:00
kevinz000 3264596bac Merge pull request #10930 from r4d6/meteor-alt-2
Put the meteor timer to 3-5 minutes
2020-02-08 21:12:38 -07:00
r4d6 49f2993c59 Correct timer 2020-02-08 23:09:51 -05:00
r4d6 5316cc3665 Make dwarves not have an accent when speaking dwarvish 2020-02-08 23:02:32 -05:00
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