kevinz000
|
41f02fa24d
|
Update capture_the_flag.dm
|
2020-02-12 00:26:58 -07:00 |
|
Ghom
|
ac64f6574c
|
Merge pull request #11003 from kevinz000/meme_rifles
Fixes energy lens not being in gun contents
|
2020-02-11 16:11:11 +01:00 |
|
kevinz000
|
58db43621d
|
Merge pull request #10941 from Ghommie/Ghommie-cit561
Adds the ELEMENT_DETACH flag to two elements
|
2020-02-11 00:42:15 -07:00 |
|
Lin
|
f1f8123e5a
|
Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5
CallMaterialName reagent fix
|
2020-02-10 20:27:38 +00:00 |
|
Lin
|
4f546c90e3
|
Merge pull request #10982 from Ghommie/Ghommie-cit566
something about suit_digi.dmi
|
2020-02-10 20:24:35 +00:00 |
|
Ghom
|
c8a62e7acf
|
Merge pull request #10985 from r4d6/Dwarf
Dwarven Update
|
2020-02-10 12:23:23 +01:00 |
|
Ghom
|
3ee4f25626
|
Merge pull request #11001 from Arturlang/P.A.N.D.E.M.I.C_fixes
Pandemic Fixes
|
2020-02-10 12:22:40 +01:00 |
|
Ghom
|
a0666e7454
|
Merge pull request #11000 from Seris02/rcdfixyeet
makes RCDs not cost a single sheet of glass and metal
|
2020-02-10 12:20:40 +01:00 |
|
kevinz000
|
c29e0e1a1d
|
Merge pull request #10596 from Seris02/hijackbackup
Hijack Implant
|
2020-02-10 04:16:14 -07:00 |
|
kevinz000
|
79146bce9b
|
Merge pull request #10967 from Citadel-Station-13/Ghommie-patch-3
Fixes AI unanchoring not properly removing the no teleport trait.
|
2020-02-10 04:15:29 -07:00 |
|
kevinz000
|
c9e5fd1c17
|
Merge pull request #10988 from YakumoChen/master
Reverts 10486 (Observe verb in the Ghost tab)
|
2020-02-10 04:14:33 -07:00 |
|
kevinz000
|
c3eaa0fcbd
|
Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1
Prevents certain unpurchasable discounts.
|
2020-02-10 04:11:35 -07:00 |
|
kevinz000
|
88fa342c26
|
Merge pull request #10976 from Ghommie/Ghommie-cit565
fixing another issue with the hear component signal.
|
2020-02-10 04:09:19 -07:00 |
|
kevinz000
|
45bec21520
|
fix sync
|
2020-02-10 04:01:21 -07:00 |
|
Artur
|
816f94bd61
|
pandemic fixes
|
2020-02-10 10:20:57 +02:00 |
|
Seris02
|
e6aa47997c
|
fix rcd cost
|
2020-02-10 16:00:21 +08:00 |
|
Ghom
|
0d37700836
|
Merge pull request #10926 from keronshb/PirateBombProof
Buffs the Pirate Ship to be bomb resistant
|
2020-02-10 08:40:10 +01:00 |
|
Ghom
|
33688dbe93
|
Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
Nerfing Stimulants
|
2020-02-09 23:56:52 +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 |
|
YakumoChen
|
1c24797de1
|
revert 10486
|
2020-02-09 06:41:13 +00: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 |
|
Ghom
|
2a0ba12896
|
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
gun qdel fix
|
2020-02-09 02:53:38 +01: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 |
|
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 |
|
Seris02
|
0b1cb9db6d
|
timer'd
|
2020-02-08 15:25:11 +08: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 |
|
kappa-sama
|
8c2019fcbf
|
probably fixes plant disk techdisk
|
2020-02-07 17:58:36 -05: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
|
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 |
|