f2835095a7
Merge branch 'master' into goonchatv3
2017-05-09 14:25:00 -04:00
15cd682eef
Makes it clear whether (in)complete golem shells are free or servant ( #27025 )
...
* Artifical golem shells now have "artificial" in the name
So it's clear whether you're becoming a free or an enslaved golem.
2017-05-08 15:56:47 -03:00
ffbdc49188
Merge branch 'master' of https://github.com/tgstation/tgstation into goonchatv3
2017-05-08 09:23:55 -04:00
e8c1c60942
Merge pull request #26980 from AnturK/click-fixes
...
Small Click refactor.
2017-05-08 20:05:39 +12:00
7436d7d990
Merge pull request #26854 from FantasticFwoosh/LeatherClub
...
Refactors leather with crafting, removed bio-generator designs + adds craftable muzzles
2017-05-08 20:04:23 +12:00
ad4f15d501
Merge pull request #26938 from Cyberboss/patch-76
...
Fixes his grace CtrlClick
2017-05-07 13:33:46 -03:00
ec140736da
C4 planting takes 3 seconds, down from 5 ( #26941 )
...
* 2 seconds of c4 planting
* Why the fuck do we have 2 C4 weapons
* Update explosives.dm
2017-05-07 09:31:34 -05:00
74f00e629f
Cult fixes ( #26990 )
...
* Cult fixes
* ha ha whoops
* whoooops
* whoops x3 combo
2017-05-07 00:51:40 -03:00
41067e00f5
Merge pull request #26933 from QualityVan/vendingbuilds
...
Makes medbay vending machines buildable
2017-05-06 15:51:24 -03:00
30eb129000
Merge pull request #26943 from Cyberboss/c4Remove
...
Repaths C4
2017-05-06 15:48:35 -03:00
8f40e14a79
Small Click refactor.
2017-05-06 14:10:11 +02:00
bcfeebb060
Merge branch 'master' into goonchatv3
2017-05-05 19:18:25 -04:00
74c0756e28
Repaths C4
2017-05-05 13:23:45 -04:00
0c72dc1ab9
Make adamantine with adamantine slime cores
2017-05-05 18:08:40 +01:00
4141adf931
Update his_grace.dm
2017-05-05 09:00:20 -04:00
76fc44167a
Makes medbay vending machines buildable
2017-05-05 02:11:21 -04:00
c2bfa07473
Revert "Removes the gang gamemode" ( #26915 )
2017-05-04 21:19:02 -05:00
8a0196c8ed
Merge pull request #26873 from BeeSting12/spawnernades
...
Fixes grammar error on spawner grenades
2017-05-04 22:25:17 -03:00
37be45d211
Adds spewium toxin in traitor kits ( #26848 )
2017-05-04 19:53:06 -03:00
03bcadc9f7
Merge pull request #26863 from Cyberboss/patch-63
...
Fixes dropped cyborg repair modules
2017-05-04 19:49:51 -03:00
846f31ca52
Merge pull request #26816 from lzimann/badgamemode
...
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
1a5fbe2277
Merge pull request #26808 from FantasticFwoosh/AstroHellTurf
...
Adds aesthetic basalt floor tiles
2017-05-04 23:11:30 +12:00
eb2de76dfc
Merge pull request #26798 from QualityVan/mouthcheck
...
Adds examining mouths with flashlights
2017-05-04 23:10:43 +12:00
9f3eefdf30
- unleash
2017-05-03 21:41:58 -04:00
cd08447b30
Fixes dropped cyborg repair modules
2017-05-03 17:20:19 -04:00
27dedd6d6b
Fixes syntax to compile
...
No jokes allowed; killjoys. I have tested it and it now compiles.
2017-05-03 17:19:12 +01:00
68771eae4c
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2
2017-05-03 12:28:28 -03:00
1c7503dbcb
Creates a global craft list for leather + muzzle
...
Adds the muzzle object to global crafting & other leather objects ported from biogen (some not all)
2017-05-03 15:58:12 +01:00
b7864be38a
Curator
2017-05-03 08:08:14 -04:00
e992c0dac6
Capitalizes machine names when they talk on radio channels
2017-05-02 14:58:11 -04:00
59eed8f11c
Removes the gang gamemode
2017-05-02 14:28:55 -03:00
3a7d424005
Curator Update
2017-05-02 11:21:54 -04:00
ff025e01c3
LAZYLEN and sanity checks
2017-05-02 10:20:59 -04:00
534242599c
Adds fake basalt tiles
2017-05-02 08:26:15 +01:00
2d82d3d597
Adds fake basalt floor tile to sandstone recipies
...
Without meaning to split sand and ash (since they are not distinct enough) it is fair to add it to the relevant recipe of sandstone, mainly since you can dig up the turf the patch it over again
2017-05-02 08:24:07 +01:00
3b9b4e0755
Changes a bunch of hrefs to the proper defines ( #26760 )
2017-05-02 01:19:51 -06:00
7980b7706f
Defines, their
2017-05-02 01:48:59 -04:00
001002c68e
Mirrors, pills, and arbitrary mouth organs
2017-05-02 01:25:06 -04:00
7e5c365ade
Adds examining mouths with flashlights
2017-05-01 21:37:30 -04:00
44991e125a
Removal of checks II
...
- VR sleepers are human only.
2017-05-01 19:01:16 +01:00
7cb8007556
Changes /obj/machinery to have atom/movable occupants
...
Currently `occupant` in /obj/machinery is a /mob/living type. I have
changed it to /atom/movable, and made a type cache to determine what to
"look for" when `close_machine()` is called.
This means that machines can have non-mob occupants. I have some design
ideas for this, but that's after the freeze.
2017-05-01 19:00:07 +01:00
f2263cd082
Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2
2017-05-01 00:47:34 -03:00
57f8e92957
Proselytizers can now charge from Sigils of Transmission, and Sigils of Transmission can be charged with brass ( #26725 )
2017-05-01 00:23:50 -03:00
453b3ecb23
Ports chem grenades to Initialize ( #26678 )
2017-04-29 15:12:39 +02:00
47e0fd7283
Merge pull request #26658 from ExcessiveUseOfCobblestone/lets-try-gps-without-kms
...
GPS Personalizations [Post TGPSUI]
2017-04-29 14:05:12 +12:00
7cfef759af
Merge pull request #26527 from QualityVan/mutanthands
...
Zombie/limb refactors/fixes
2017-04-29 14:03:53 +12:00
e8395c752e
Merge pull request #26597 from Cyberboss/patch-63
...
Tank suicide no longer gibs w/o enough pressure
2017-04-29 13:59:12 +12:00
53677a7f7f
Fixes conflicts
2017-04-28 08:37:13 -03:00
e803369fd9
Merge pull request #26634 from Core0verload/tochat_master_race
...
Changes some << to to_chat
2017-04-28 08:14:09 -03:00
409f4abbf3
ugh
2017-04-27 17:45:34 -04:00
Cyberboss
coiax
oranges
Leo
Robustin
Joan Lung
AnturK
QualityVan
PKPenguin321
Mike Long
BeeSting12
FantasticFwoosh
KorPhaeron
ExcessiveUseOfCobblestone