Commit Graph

10683 Commits

Author SHA1 Message Date
PKPenguin321 c2bfa07473 Revert "Removes the gang gamemode" (#26915) 2017-05-04 21:19:02 -05:00
Leo 8a0196c8ed Merge pull request #26873 from BeeSting12/spawnernades
Fixes grammar error on spawner grenades
2017-05-04 22:25:17 -03:00
Leo 6e970f26d7 Merge pull request #26871 from Cyberboss/patch-70
Fixes some stuff
2017-05-04 20:40:14 -03:00
Incoming5643 c67f412d9f Curator starts with the key to the display cases instead of being the key (#26869)
* Moves the curators ability to use display cases from an intrinsic to an extrinsic key that the curator starts with.
2017-05-04 20:15:26 -03:00
Leo 3c0b3d4ad5 Merge pull request #26849 from KorPhaeron/newtrees
New Tree Sprites
2017-05-04 19:57:55 -03:00
Mike Long 37be45d211 Adds spewium toxin in traitor kits (#26848) 2017-05-04 19:53:06 -03:00
Leo 03bcadc9f7 Merge pull request #26863 from Cyberboss/patch-63
Fixes dropped cyborg repair modules
2017-05-04 19:49:51 -03:00
Leo d6640544ff Merge pull request #26870 from ChangelingRain/mendingcog
Adds an effect to Mending Mantra to show who is chanting it
2017-05-04 19:48:43 -03:00
Robustin 94cd7abce3 Merge branch 'master' into CultMasterAttempt2 2017-05-04 10:41:40 -04:00
Jack Edge 27b83cdff2 Golems do not have underclothing
- New species flag NO_UNDERWEAR.
- Species with this flag do not have underwear, undershorts or socks
rendered on their mobs, and are unable to use dressers.

🆑 coiax
fix: Golems no longer have underwear, undershorts or socks.
/🆑

If golems are unable to wear human jumpsuits or exosuits, they
certaintly won't be able to wear anything tighter.
2017-05-04 14:36:14 +01:00
oranges 846f31ca52 Merge pull request #26816 from lzimann/badgamemode
Removes the gang gamemode
2017-05-04 23:29:27 +12:00
oranges 1a5fbe2277 Merge pull request #26808 from FantasticFwoosh/AstroHellTurf
Adds aesthetic basalt floor tiles
2017-05-04 23:11:30 +12:00
oranges eb2de76dfc Merge pull request #26798 from QualityVan/mouthcheck
Adds examining mouths with flashlights
2017-05-04 23:10:43 +12:00
BeeSting12 9f3eefdf30 - unleash 2017-05-03 21:41:58 -04:00
Cyberboss c8592f7202 Makes things use the write procs 2017-05-03 19:56:43 -04:00
Joan Lung 2729d025a3 Adds an effect to Mending Mantra to show who is chanting it 2017-05-03 19:10:36 -04:00
Cyberboss cd08447b30 Fixes dropped cyborg repair modules 2017-05-03 17:20:19 -04:00
Robustin 5a98d90b5c Merge branch 'master' of https://github.com/tgstation/-tg-station into CMA6
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
2017-05-03 12:28:16 -04:00
FantasticFwoosh 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
Lzimann 68771eae4c Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-03 12:28:28 -03:00
Joan Lung 4d1e3ce607 Merge pull request #26813 from KorPhaeron/librarian
Curator Update
2017-05-03 11:18:15 -04:00
FantasticFwoosh 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
KorPhaeron d388dee8b7 New Tree Sprites 2017-05-03 10:19:56 -04:00
Leo 87bdd1efe8 Merge pull request #26774 from XDTM/Eggh
Fixes alien eggs
2017-05-03 09:30:03 -03:00
KorPhaeron b7864be38a Curator 2017-05-03 08:08:14 -04:00
Robustin 3423cbeba5 Finally working again 2017-05-02 19:25:49 -04:00
Profakos 4c583a1f4f Trophy case hotfixes (#26822)
* Checks if the file's contents are empty

* Prevents afterattack on insertion

* True
2017-05-02 15:36:37 -04:00
QualityVan e992c0dac6 Capitalizes machine names when they talk on radio channels 2017-05-02 14:58:11 -04:00
Lzimann 59eed8f11c Removes the gang gamemode 2017-05-02 14:28:55 -03:00
KorPhaeron 2490d201a9 Missing Return 2017-05-02 11:49:29 -04:00
KorPhaeron 3a7d424005 Curator Update 2017-05-02 11:21:54 -04:00
XDTM 32dd2d65e9 Makes golems able to transfer into empty shells (#26765)
* Makes golems able to transfer into empty shells

* Name & plasma
2017-05-02 08:59:47 -06:00
Cyberboss 5fa5e68a42 Fixes proximity sensors not tracking correctly (#26769) 2017-05-02 08:54:47 -06:00
QualityVan ff025e01c3 LAZYLEN and sanity checks 2017-05-02 10:20:59 -04:00
FantasticFwoosh 534242599c Adds fake basalt tiles 2017-05-02 08:26:15 +01:00
FantasticFwoosh 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
Leo 3b9b4e0755 Changes a bunch of hrefs to the proper defines (#26760) 2017-05-02 01:19:51 -06:00
QualityVan 7980b7706f Defines, their 2017-05-02 01:48:59 -04:00
QualityVan 001002c68e Mirrors, pills, and arbitrary mouth organs 2017-05-02 01:25:06 -04:00
Really-Good-Soda-Flavor a0459ad410 Moves playsound_local() to mob and gets rid of a useless proc. (#26726)
* playsound_local to mob

* Suggested change
2017-05-01 20:01:55 -06:00
QualityVan 7e5c365ade Adds examining mouths with flashlights 2017-05-01 21:37:30 -04:00
Profakos c4320ee111 Adds persistent trophy cases (#26745)
* Persistent trophy cases

* QDEL_NULLs, TrySaveTrophy

* Breaking tweaks

* Persistence tweaks, moves the alert message

* JSON format and ckey logging

* Showpiece dummy

* Better illegal check
2017-05-01 16:31:06 -06:00
XDTM bc2dcce865 Fixes alien eggs 2017-05-01 20:38:46 +02:00
Jack Edge 44991e125a Removal of checks II
- VR sleepers are human only.
2017-05-01 19:01:16 +01:00
Jack Edge 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
Lzimann f2263cd082 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchatv2 2017-05-01 00:47:34 -03:00
Joan Lung 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
Robustin 4103871708 Merge branch 'master' of https://github.com/tgstation/tgstation into CMA4
# Conflicts:
#	code/datums/antagonists/datum_cult.dm
#	code/game/gamemodes/cult/cult.dm
#	code/modules/mob/living/simple_animal/constructs.dm
#	icons/mob/actions.dmi
2017-04-30 16:36:36 -04:00
Cyberboss 453b3ecb23 Ports chem grenades to Initialize (#26678) 2017-04-29 15:12:39 +02:00
oranges 47e0fd7283 Merge pull request #26658 from ExcessiveUseOfCobblestone/lets-try-gps-without-kms
GPS Personalizations [Post TGPSUI]
2017-04-29 14:05:12 +12:00