942f3f28be
Merge pull request #10994 from DeltaFire15/narsierunefix
...
Mom said its my time to scribe Nar'Sie (Alternatively: Nar'Sie runes no longer take half the time (or even less) to scribe on runed floor)
2020-02-12 16:51:38 +01:00
2674fa6efc
Merge pull request #11043 from Seris02/apcthingfix
...
fixes apc icons
2020-02-12 15:35:01 +01:00
eb5835f668
fixes apcs
2020-02-12 21:35:51 +08:00
8c2801fda6
Merge pull request #11018 from Citadel-Station-13/kevinz000-patch-4
...
EMPs now function as intended and mute pAIs for 3 minutes, not 60 minutes.
2020-02-12 11:14:27 +01:00
af477aa28b
Merge pull request #10992 from Hatterhat/buckbuff
...
buckshot buff - 60 to 75 on all pellet pointblank
2020-02-12 10:34:25 +01:00
0917617543
Merge pull request #11004 from Citadel-Station-13/kevinz000-patch-2
...
improves getImplant by using locate()
2020-02-12 10:33:08 +01:00
ce5208a1df
Merge pull request #11007 from r4d6/random-fixes
...
Mining Shuttle Fix
2020-02-12 10:10:16 +01:00
fc3f0d02fc
Merge pull request #11032 from Citadel-Station-13/kevinz000-patch-7
...
Fixes cryotubes not transferring reagents for minutes at a time (because at tier 4 it takes 80 * 20 = 1600 deciseconds (!!!) to .. transfer regeants??)
2020-02-12 09:09:36 +01:00
2ed19e0a5a
Merge pull request #10861 from ancientpower/far-sliding-port
...
Ports /vg/station drink sliding
2020-02-12 09:06:03 +01:00
ecbb7767c3
Update cryo.dm
2020-02-11 23:07:47 -07:00
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
f247c6d8c6
Update pai_defense.dm
2020-02-11 04:27:22 -07:00
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
1d071ff127
one off
2020-02-10 21:40:51 -06:00
f1f8123e5a
Merge pull request #10989 from Citadel-Station-13/Ghommie-patch-5
...
CallMaterialName reagent fix
2020-02-10 20:27:38 +00:00
4f546c90e3
Merge pull request #10982 from Ghommie/Ghommie-cit566
...
something about suit_digi.dmi
2020-02-10 20:24:35 +00:00
dccbb49626
Fixes
2020-02-10 11:59:14 -05:00
520dd57bf9
Update mob_helpers.dm
2020-02-10 04:33:27 -07:00
c8a62e7acf
Merge pull request #10985 from r4d6/Dwarf
...
Dwarven Update
2020-02-10 12:23:23 +01:00
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
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
c29e0e1a1d
Merge pull request #10596 from Seris02/hijackbackup
...
Hijack Implant
2020-02-10 04:16:14 -07:00
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
c9e5fd1c17
Merge pull request #10988 from YakumoChen/master
...
Reverts 10486 (Observe verb in the Ghost tab)
2020-02-10 04:14:33 -07:00
c3eaa0fcbd
Merge pull request #10948 from Citadel-Station-13/Ghommie-patch-1
...
Prevents certain unpurchasable discounts.
2020-02-10 04:11:35 -07:00
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
45bec21520
fix sync
2020-02-10 04:01:21 -07:00
816f94bd61
pandemic fixes
2020-02-10 10:20:57 +02:00
e6aa47997c
fix rcd cost
2020-02-10 16:00:21 +08:00
0d37700836
Merge pull request #10926 from keronshb/PirateBombProof
...
Buffs the Pirate Ship to be bomb resistant
2020-02-10 08:40:10 +01:00
55a5686c01
No more Narsie runes in half the time or less
...
Why exactly are we allowing cultists to write nar nar with half the time on runed floors? So thats why people are always too late...
2020-02-10 02:46:54 +01:00
d24afcde1b
pb burst from 60 to 81
2020-02-09 19:07:24 -06:00
33688dbe93
Merge pull request #10981 from IHOPMommyLich/AdrenalsChange
...
Nerfing Stimulants
2020-02-09 23:56:52 +01:00
c7614958bc
Merge pull request #10937 from Arturlang/debug_outfit_updates
...
Updates the debug outfit
2020-02-09 22:49:22 +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
101640170b
Merge pull request #10954 from Citadel-Station-13/kevinz000-patch-9
...
repulse sanity
2020-02-09 21:09:00 +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
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
2a0ba12896
Merge pull request #10952 from Citadel-Station-13/kevinz000-patch-11
...
gun qdel fix
2020-02-09 02:53:38 +01:00
98a525568f
Ok.
2020-02-08 23:59:20 +01:00
3485d82dd0
salty digi man bad.
2020-02-08 23:58:05 +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
Ghom