Commit Graph

4032 Commits

Author SHA1 Message Date
Remie Richards 86c0a1805f Merge pull request #12321 from phil235/RuntimeFixA
Fixes some runtimes
2015-10-13 23:09:48 +01:00
Remie Richards 16db6f8cc0 Merge pull request #12299 from phil235/SlimeFeedBuckling
Slime feed buckling
2015-10-13 23:08:06 +01:00
Remie Richards 6def937564 Merge pull request #12313 from freerealestate/borgrcdfix
Fixes #12309: Borg RCDs using too much power
2015-10-13 23:07:11 +01:00
Remie Richards 68a3d0bd29 Merge pull request #12086 from AnturK/loneop
Nukeop Outfits,Uplink gamemode override, Lone Operative event.
2015-10-13 23:02:51 +01:00
AnturK 8e5b51b177 Makes t-rays detect mobs in pipes 2015-10-13 21:31:31 +02:00
Marc R. Uchniat 35d3aae16b took the spawn back out because @aranclanos said to 2015-10-12 15:00:26 -07:00
phil235 a311e7a739 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeFeedBuckling
Conflicts:
	code/game/objects/structures/janicart.dm
2015-10-12 22:01:57 +02:00
Razharas 84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
Steelpoint ac57b4ee03 InitalCommit 2015-10-12 11:59:33 +08:00
phil235 8daa8d9075 Fixes some admin buttons in certain admin messages ("move ferry" in the ferry request message, "adminmoreinfo", "antagonist" (to check antagonist) in player panel, 'list_signalers' button in transfer valve opening message).
Fixes Blue space artillery button in Centcom message, nuke code request message and syndicate message.
2015-10-12 02:03:31 +02:00
Marc R. Uchniat d48396f2ab place for under spawn 2015-10-11 16:49:44 -07:00
Marc R. Uchniat 811a4ddd3f clean up and simplify, thanks @remierichards 2015-10-11 16:46:13 -07:00
Marc R. Uchniat b6ae6f6567 re-enable tank suicide, but retain body and all objects 2015-10-11 15:54:03 -07:00
Incoming d421ce1aad Changes up the dice selection method:
You will now always get a standard assortment of six dice (d4, d6, d8, d10, d12, d20)
The seventh die will be choosen from the remaining exotic dice (d1, d2, d00, d100)
2015-10-11 12:06:18 -04:00
phil235 9c3d5ae3c7 Fixes runtimes with augmented_eyesight refund, atom/movable/Bump(), fleshmend, spraycans, PDA messaging, remove_from_storage(), and gun burstfiring. 2015-10-11 17:18:31 +02:00
freerealestate f160910915 Fixes borg RCDs using too much power. They're now about 1.3x as efficient as their human counterparts. 2015-10-11 22:31:02 +13:00
Incoming b9d4b8322d Adds d1 and d100 dice
Dice bags will now give you a shuffle of 7 dice from a list of all dice (d1, d2, d4, d6, d8, d10, d12, d20, d100)

Moves dice bags from firstaid.dm to dice.dm
2015-10-10 21:41:29 -04:00
phil235 df171284cb Slimes now uses buckling to feed and attach themselves on mobs. This removes the silly check in mob/Move(), reducing lag.
Fixes mobs being able to attach slimes onto other mobs.
2015-10-10 20:41:27 +02:00
phil235 9c79257aab Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.
Beds (and chairs) now have buildstacktype and buildstackamount vars to handle how many sheets of what they should drop on deconstruction.
They also have a foldabletype var to handle folding into item (currently only used by roller beds) so that people can add foldable chairs in the future.
Fixes swivel chairs not dropping the correct amount of metal sheets.
2015-10-10 13:35:00 +02:00
KorPhaeron 31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Razharas 297c5d7d4e Merge pull request #12247 from CosmicScientist/ThreeGrammarFixes
Cigs, urinals, infrared lasers, oh my!
2015-10-10 03:29:42 +03:00
Razharas 8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
Razharas 9dec40d8d5 Removed colon
Removed colon
2015-10-10 02:31:19 +03:00
Razharas 880a9f0544 Merge branch 'cargonevergetsanything' of https://github.com/bgobandit/-tg-station into bgobandit-cargonevergetsanything 2015-10-10 02:28:24 +03:00
Razharas effae76516 Merge branch 'bundlestuff' of https://github.com/bgobandit/-tg-station into bgobandit-bundlestuff 2015-10-10 02:04:43 +03:00
CosmicScientist 58f6c961e4 Cigs, urinals, infrared lasers, oh my! 2015-10-08 22:45:09 +01:00
phil235 832e650ffc Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
Dipping a lit cigarette into a reagent container heats up the liquid (like every other heat sources) and only unlit cigarette can be dipped to absorb the liquids now.
2015-10-08 01:26:55 +02:00
phil235 0efb30434a Fixes not being able to move during jaunting if you are cuffed and pulled.
Greenglow decal no longer disappears after 2 minutes.
Fixes runtime with explosive implant activation.
Fixes stunbaton infinite cell charge, the baton now turns off if you try using it after its cell has been deleted somehow.
Fixes bloody pulled mob leaving a blood trail in zero G.
Shortens the guardian battlecry message when attacking to lower chat spam.
Items in Morph now disperses a bit on death instead of being all on the same tile.
After reaching a limit of 50 items, morph swallowing items deletes them instead of putting them inside the morph.
Monkeys can no longer modify the hand labeller's text to communicate.
Fixes carbon,radium,uranium 's reaction_turf creating multiple decal on a tile, it now checks if there's already a decal of the relevant type and (for radium and uranium) only transfers reagent to it if it finds one.
2015-10-08 00:48:00 +02:00
Remie Richards 97de4b2ebe Merge branch 'master' of https://github.com/tgstation/-tg-station into HandOfGod-Resurgence
Conflicts:
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/storage.dmi
2015-10-07 22:24:53 +01:00
Razharas 92523c03f2 Merge pull request #12137 from Xhuis/sleeping_carp_buff_2_please_dont_ban_me_from_the_repo
Sleeping Carp changes
2015-10-07 22:25:11 +03:00
Swag McYolosteinen 38f5c0c85a Merge pull request #12122 from Steelpoint/Magazine
[MAP] Continuation Of Armoury Map PR + Magazine Removal
2015-10-07 15:13:15 +02:00
Razharas 7242d12cb0 Merge pull request #12159 from Aranclanos/tanksuicide
Changes the tank suicide act to bruteloss instead of gibbing.
2015-10-06 21:52:49 +03:00
Razharas 9b710d7fcb Merge pull request #12153 from duncathan/destroyfixes
Destroy() fixes
2015-10-06 09:27:41 +03:00
Razharas 87c9960d6c Merge pull request #12102 from bgobandit/singlotips
FIXES SINGULARITY BEACON AND POWERSINK TEXT, IT WORKS, I DON'T CARE, FUCK
2015-10-05 22:16:00 +03:00
AnturK ed8e252d00 Gamemode override for uplinks 2015-10-05 12:13:37 +02:00
Aranclanos 4d03f22943 Changes the tank suicide act to bruteloss instead of gibbing. 2015-10-04 20:16:39 -03:00
duncathan 4475824890 fixes #12143 2015-10-04 07:33:32 -06:00
Xhuis 1211ec4102 Some gang stuff 2015-10-04 00:26:26 -04:00
Razharas 653e5d18f3 Merge pull request #12027 from Fox-McCloud/advancedmop
Re-Adds Advanced Mop, Adds in Bluespace Trashbag, and Suds up the Janitor
2015-10-04 05:13:48 +03:00
Razharas d46f6b582f Merge pull request #12079 from bgobandit/boxshit
Adds additional items to the storage of many coats and oversuits.
2015-10-03 18:13:03 +03:00
Cheridan 207f6a6048 Merge pull request #12108 from Jordie0608/tilessolightyoucantevenseethem
Fixes #11268, iconless wired glass tiles
2015-10-03 09:24:07 -05:00
Steelpoint b5ded1c9e8 InitalCommit 2015-10-03 21:22:29 +08:00
Jordie c6627b3d70 Fixes iconless wired glass tiles 2015-10-02 21:28:19 +10:00
bgobandit 8e82cf324a Merge branch 'master' of https://github.com/bgobandit/-tg-station into boxshit
Conflicts:
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/utility.dm
2015-10-02 00:41:19 -04:00
bgobandit 6c303a37cd THIS FUCKING SHIT RIGHT HERE FUCK 2015-10-01 23:12:40 -04:00
Razharas 54d9e6924d Merge pull request #11868 from bgobandit/diditallforthelewdbe
Adds kitty mousey toys!
2015-10-01 05:06:34 +03:00
Razharas 3bf8ae1f1a Merge pull request #12057 from Xhuis/it_worked_in_testing_3
Fixes and tweaks to Syndicate medical cyborgs
2015-09-30 23:14:58 +03:00
Razharas e08ecefd18 Merge pull request #12066 from feemjmeem/12013-fix
tank suicide now drops items in hand, shreds clothing
2015-09-30 23:12:26 +03:00
Razharas 1aa0e911ae Merge pull request #11760 from Core0verload/selfrepair
Cyborgs update
2015-09-30 22:50:08 +03:00
bgobandit 26b8112dea Adds additional items to the storage of many coats and oversuits. 2015-09-29 22:29:07 -04:00