c2baad44d8
Merge pull request #10277 from kevinz000/god_wish_your_plushies_holy_shit
...
ENDS THE PLUSHIE DRAMA
2020-02-09 21:47:30 +01:00
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
9609eb64e0
Fixes some files and pathings for this
...
Adds proper subtypes, put the health down a lil bit for the turret, fixed the welder type, added some tiny fans to the ship and also added some plastitanium windows where r-windows were
2020-02-09 15:18:15 -05:00
101640170b
Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
...
repulse sanity
2020-02-09 21:09:00 +01:00
d991fa1252
Merge pull request #10972 from Trilbyspaceclone/so-then-I-started-nerfing
...
Removes bone armor and dagger from crafting menu
2020-02-09 21:08:16 +01:00
29207b22fb
Merge branch 'master' into debug_outfit_updates
2020-02-09 22:05:26 +02:00
e4f2af2d77
compile
2020-02-09 07:34:21 -05:00
9ba0a1b470
Code update
2020-02-09 07:21:47 -05:00
bcbaea4a7b
CallMaterialName reagent fix
2020-02-09 10:46:29 +01:00
1c24797de1
revert 10486
2020-02-09 06:41:13 +00:00
f6adce72fb
Something about missing private sprites and their bad code.
2020-02-09 06:51:57 +01:00
e6398815b6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Dwarf
2020-02-08 23:23:28 -05:00
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
49f2993c59
Correct timer
2020-02-08 23:09:51 -05:00
5316cc3665
Make dwarves not have an accent when speaking dwarvish
2020-02-08 23:02:32 -05:00
a8403cb072
Make Dwarves heal from Plump Helmet
2020-02-08 22:40:17 -05:00
d49a53e193
Update costumes_toys.dm
2020-02-08 22:17:58 -05:00
506f1199ad
I have a bad habit to edit people's (especially trilby) PRs out of the wild. Sorry
2020-02-09 02:56:17 +01:00
2a0ba12896
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
...
gun qdel fix
2020-02-09 02:53:38 +01:00
ea9bdcd087
Update gangs.dm
2020-02-09 02:49:20 +01:00
90a1b249f1
Update gangs.dm
2020-02-08 20:39:45 -05:00
1e2562ed02
Update organic.dm
2020-02-08 18:59:00 -05:00
98a525568f
Ok.
2020-02-08 23:59:20 +01:00
3485d82dd0
salty digi man bad.
2020-02-08 23:58:05 +01:00
e5236eebb1
hey lets do corrections
2020-02-08 17:39:00 -05:00
f27ce86769
Merge pull request #10942 from Putnam3145/map-vote-options
...
Added a config for map voting types
2020-02-08 23:31:33 +01:00
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
860c8136df
Lowers the movespeed provided by Stimulants, weakening Stimpacks and Adrenals.
2020-02-08 17:01:12 -05:00
eaa6bc2db5
fixing another issue with the hear comsig proc.
2020-02-08 19:37:18 +01:00
611c850639
all you need to understand is everything you know is wrong
2020-02-08 00:31:46 -08:00
612b5c5da3
better name
2020-02-08 03:27:43 -05:00
5dbfc9a514
Yay
2020-02-08 03:25:09 -05:00
30c78c5be2
Let their be lists
2020-02-08 02:37:37 -05:00
0b1cb9db6d
timer'd
2020-02-08 15:25:11 +08:00
76219e0188
Primortial
2020-02-08 02:21:14 -05:00
6e969808f3
capitalization is FUN!
2020-02-08 00:53:22 -06:00
c6c1cc484c
slight buff
2020-02-07 23:40:02 -07:00
826ed7d4f2
o k.
2020-02-07 23:39:09 -07:00
79a72fac24
fix
2020-02-07 23:32:36 -07:00
7c16830e91
ok
2020-02-07 23:31:38 -07:00
6d8bfd2a38
tru
2020-02-08 14:01:51 +08:00
6af421994a
yay
2020-02-08 13:53:43 +08:00
82e36846bc
/datum/element/cleaning cleans your face!
2020-02-08 06:18:00 +01:00
c45dab8ebd
uhh?
2020-02-07 20:37:22 -08:00
890274ce87
Update ai.dm
2020-02-08 05:08:06 +01:00
84a9f2f058
make the fallback majority judgement
2020-02-07 19:54:15 -08:00
bb140df39c
Fixing mob holders
2020-02-08 04:04:16 +01:00
f8d5eae0c3
Update gravity.dm
2020-02-07 16:24:12 -07:00
8365fec82e
Update negative.dm
2020-02-08 00:05:23 +01:00
8c2019fcbf
probably fixes plant disk techdisk
2020-02-07 17:58:36 -05:00
Ghom