[Ready] /tg/ Merge May 20 #601
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fragile thrown food items use del instead of qdel. Fixes issue #3561
Added sounds for wall-smashing.
…hinery.dm The Topic() proc of machinery will use this. The first non-machinery item to use this will be the violin and piano. There are plans to make admin observers use this, to make AIs don't be able to use Topic() when they lose power (doing that currently will break gameplay) and make all items use the canUseTopic() proc if needed. I just wanted to pull the fix for the piano and violin quick, the rest is a todo.
Made light bulbs have 4 brightness and tubes 8 by default, no random variables changing this value.
Reisin membranes won't
…nging their lying to 1, making weird blurry mobs
…flavorful message.
Fixes issue NTStation#119 Transferred all the different colours of under clothes and shoes to obj/item/clothing/under/colour/XXX and obj/item/clothing/shoes/sneakers/XXX Added two extra options to the spawn menu of the game panel, clothing and food.
Much less nutrition consumed, but they actually use it to grow Made mutation chance random between 25 and 35 Slime core reactions use 1 unit of reagent Code cleanups
Snowflake garbage removed
Re-adding missing hivelord core sprite (courtesy of Nerolat)
Travis will now automatically compile the maps in the map_test shell script.
Fixes newscaster spam when announcements via RCs are made
…o tgmerge1 Conflicts: .travis.yml NTstation13.dme README.md _maps/map_files/MetaStation.v39K.dmm _maps/map_files/tgstation.2.1.2.dmm _maps/map_files/tgstation.2.1.3.dmm code/_globalvars/configuration.dm code/controllers/configuration.dm code/controllers/shuttle_controller.dm code/datums/helper_datums/getrev.dm code/game/gamemodes/objective_items.dm code/game/gamemodes/wizard/soulstone.dm code/game/jobs/access.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/engineering.dm code/game/jobs/job/job.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job_controller.dm code/game/machinery/Sleeper.dm code/game/machinery/autolathe.dm code/game/machinery/bots/cleanbot.dm code/game/machinery/computer/card.dm code/game/machinery/computer/communications.dm code/game/machinery/suit_storage_unit.dm code/game/machinery/washing_machine.dm code/game/objects/items/stacks/sheets/glass.dm code/game/objects/items/stacks/sheets/sheet_types.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/storage/uplink_kits.dm code/game/objects/structures/crates_lockers/closets/secure/security.dm code/game/objects/structures/crates_lockers/closets/wardrobe.dm code/game/turfs/simulated/walls.dm code/modules/clothing/glasses/hud.dm code/modules/clothing/shoes/magboots.dm code/modules/clothing/under/color.dm code/modules/events/immovable_rod.dm code/modules/events/spacevine.dm code/modules/hydroponics/grown.dm code/modules/mining/equipment_locker.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mob/living/carbon/human/human_attackalien.dm code/modules/mob/living/carbon/monkey/monkey.dm code/modules/mob/living/silicon/ai/ai.dm code/modules/mob/living/silicon/silicon.dm code/modules/mob/living/simple_animal/constructs.dm code/modules/mob/living/simple_animal/hostile/mining_mobs.dm code/modules/projectiles/ammunition/bullets.dm code/modules/projectiles/gun.dm code/modules/recycling/disposal.dm code/modules/research/designs.dm config/admins.txt config/motd.txt html/changelog.html icons/mob/AI.dmi icons/mob/back.dmi icons/mob/eyes.dmi icons/mob/feet.dmi icons/mob/head.dmi icons/mob/human_face.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/mask.dmi icons/obj/clothing/glasses.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/shoes.dmi icons/obj/clothing/suits.dmi icons/obj/food.dmi icons/obj/gun.dmi icons/obj/library.dmi icons/obj/lighting.dmi interface/stylesheet.dm
|
You got GPL'd. |
|
tfw travis. |
|
The Travis CI build failed |
|
its almost as if changing 301 files may lead to compile errors ❗ |
|
code/datums/helper_datums/getrev.dm:9:error: missing left-hand argument to <<. It's ogre! |
|
I've already most of the errors. |
|
thank you for doing this |
|
Yes. Thank you very much Miggggles |
|
Additionally, there are some files in this PR that I don't feel should be there, (contributing.md and box2.1.3 for example) but to spare myself the pain of reverting everything and recommitting it sans a few files, I'll make a second PR after this one which nix them. |
…o tgmerge1 Conflicts: code/game/gamemodes/changeling/powers/tiny_prick.dm code/game/jobs/access.dm code/game/machinery/autolathe.dm code/game/objects/structures/crates_lockers/closets/wardrobe.dm
|
travis you nignog |
…o tgmerge1 Conflicts: code/game/jobs/job/civilian.dm code/game/jobs/job/engineering.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm
|
OK IT'S READY |
|
HYPE FOR TEARS |
RemieRichards
added a commit
that referenced
this pull request
May 25, 2014
[Ready] /tg/ Merge May 20
|
I'm really glad this happened, good job! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Needs serious review and checking for issues and unwanted changes.