Commit Graph

6098 Commits

Author SHA1 Message Date
Razharas
f87d72571e Merge pull request #12420 from phil235/TransferAmountChange
Set Transfer Amount for reagent containers now uses attack_self() instead of object verb
2015-10-17 18:06:39 +03:00
Razharas
cf302d227f Merge pull request #12399 from Xhuis/pneumatic_cannon_optimization
Pneumatic cannon fixes and optimizations
2015-10-16 17:43:06 +03:00
Razharas
fce9bcc646 Merge pull request #12340 from Shadowlight213/Mirrormagic
Adds a lesser magic mirror limited to human and lizard race
2015-10-16 09:31:16 +03:00
Razharas
c44c6d90be Merge pull request #12350 from AnturK/ironwall
Rough Metal Walls
2015-10-16 09:08:00 +03:00
Razharas
653dcbc0f4 Merge pull request #12380 from MrPerson/alert_rewrite
Mild rewrite of screen alerts to enable more functionality
2015-10-16 09:04:50 +03:00
Aranclanos
962b088bb7 Merge pull request #12406 from bgobandit/borgycutters
Engiborgs can no longer make stunprods with their wirecutter module.
2015-10-15 23:14:03 -03:00
The Half-Finished
461726b9cc Update pneumaticCannon.dm 2015-10-15 21:16:14 -04:00
phil235
dce2027d01 Changing the transfer amount of all reagent containers (beaker, bucket, glass) is now done by clicking them, similar to spray. Reagent dispensers (watertank, fueltank, pepperspray dispenser) no longer have their own transfer amounts and use the reagent container's transfer amount instead (except for sprays which get 50u for faster refilling).
Removed object verb "Set Amount per transfer from this" for both reagent containers and reagent dispensers.
2015-10-16 01:07:10 +02:00
Xhuis
d09224e267 Changes 2015-10-15 17:26:32 -04:00
Xhuis
463e80ed62 Restores knockdown for high pressure setting 2015-10-15 17:09:48 -04:00
Razharas
8b1608d45b Merge pull request #12394 from bgobandit/grossmaymays
Toilet related tweaks and fixes
2015-10-15 16:07:29 +03:00
bgobandit
8a63e50b51 Stunprod making now checks for NODROP. 2015-10-14 21:10:42 -04:00
Xhuis
39daad8d21 Pneumatic cannon optimization 2015-10-14 17:31:58 -04:00
bgobandit
8b60afcaf2 toilet related tweaks and fixes 2015-10-14 11:48:47 -04:00
Cheridan
f56e012d87 Merge pull request #12331 from phil235/AdminTopicFix
Fixes some admin buttons in certain admin messages
2015-10-13 21:41:06 -05:00
Shadowlight213
b3693e15ca Changed to use roundstart_species list 2015-10-13 19:24:32 -07:00
MrPerson
610483ea1e Mild rewrite of screen alerts to enable more functionality
Specifically I wanted to allow #12043 to correctly implement clicking an "on fire" alert to call resist without affecting other alerts which is currently impssible. Plus this whole mess was stupid and bothering me so here we go.
2015-10-13 17:16:23 -07:00
Remie Richards
86c0a1805f Merge pull request #12321 from phil235/RuntimeFixA
Fixes some runtimes
2015-10-13 23:09:48 +01:00
Cheridan
b847f6c91f Merge pull request #12323 from phil235/BugFixBoogalooE
Bugfixes, again
2015-10-13 17:08:37 -05: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
phil235
7c6bbe328e Fixes some cases with mobs attached a mob. Can't enter a mech if attachment is done mid-climb. Can't get inside mech sleeper or closet if you have a mob attached to you. All sorts of teleports now properly teleport the attached mob as well.
Changed the warning message when climbing mech with a mob attached to be more general instead of specifically about slimes.

Getting inside a closet or machine now immediately breaks your pull and the pull of your puller.
Using ethereal jaunt now also immediately break your pull.

Fixes being able to get inside a mech sleeper while buckled by buckling mid-insertion.
2015-10-12 23:28:48 +02: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
phil235
3c788fcc59 Fixes Atmos fire helmets spawning in the wardrobe closet instead of the atmos closet.
Fixes Toggle Helmet light verb on security helmet with seclite attached being usable while dead.
Fixes Lizard snout is poking through helmet
Fixes Space helmets not hiding masks and glasses (especially the large gar glasses)
Eva harsuit helmet no longer has a semi transparent part (incompatible with hiding masks and glasses, and causes lizard snout protruding from that helmet)
Made equip_to_slot() and unEquip proc more OOP at the carbon level which removes some duplicate code between monkey and human.
Readding code\modules\mob\living\carbon\brain\login.dm that someone (probably me) unchecked some time ago by mistake.
2015-10-12 21:50:59 +02:00
AnturK
c73526334c Rough Metal Wall 2015-10-12 18:47:22 +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
Shadowlight213
6146aa156d Adds a lesser magic mirror that only allows for human and lizard race changes 2015-10-12 01:04:30 -07: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
phil235
c19d1c1427 Removed unused code in hologram.dm
Fixes displaycase when you could put a new item in it w/o first removing the first one.
Fixes parrot going through windows when getting on its perch, and some other cases of in_range() instead of Ajacent().
Fixes not being able to change transfer amount of reagent containers while buckled.
Remove unused sprites in stationobjs.dmi
2015-10-11 20:18:13 +02: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
phil235
7706b8f870 derp, let's not make janicart unbuckling runtime.
Also renaming obj/effect/spacevine/buckle_mob() to entangle_mob() since it's not really the standard buckle_mob() and could cause runtimes.
2015-10-11 14:08:06 +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
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
phil235
e9ee6adeb5 Merge pull request #12262 from francinum/patch-6
Reinforced Window Spawner
2015-10-10 11:56:46 +02:00
Razharas
570a18179b Merge pull request #12217 from GunHog/Scan_Visor_Is_My_Favorite_MP_Visor
Research Examines!
2015-10-10 08:35:43 +03:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
GunHog
839d22f842 Proper name extraction
Uses the Protolathe procs to obtain the correct tech and material names!
2015-10-09 19:44:18 -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
08d73f71c9 Merge pull request #12240 from phil235/BugFixBoogalooD
some simple Bugfixes
2015-10-10 03:26:45 +03:00
Razharas
8fd2f74d2b Merge pull request #12223 from phil235/BugFixBoogalooB
Bug fix boogaloo, etc...
2015-10-10 03:24:38 +03:00
Razharas
8d3b1ac018 Merge pull request #12202 from Xhuis/autorifle_removal
Armory re-mapping and autorifle removal
2015-10-10 03:21:52 +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
Razharas
5baaf06fce Merge pull request #12225 from phil235/BugFixBoogalooC
Trashbag can pick up ammo casings and reagent_containers/food/drinks again.
2015-10-09 12:42:17 +03:00
francinum
fbfb80a0e2 I after E
When you're spelling something not 1 line away.
2015-10-09 00:25:20 -04:00
CosmicScientist
58f6c961e4 Cigs, urinals, infrared lasers, oh my! 2015-10-08 22:45:09 +01:00
phil235
c4c447a8dc Fixes hotspot having two New() procs.
Fixes many machines and a few structure not having a cooldown when attacked with an item.
Fixes not being able to eat or be facehugged when wearing riot helmet with visor up.
Fixes not being able to use child of the tool type for craft recipes requiring tools.
Tablecrafting failure message now tells you what caused the failure (missing tool, missing component)
Fixes fuego plasma burrito recipe.
Fixes being able to grab cups from water cooler with telekinesis, putting the cup directly in your hand.
Fixes golem appearing with their old human name for a split second.
Some changes to make code more OOP (take_damage() proc for barricade, shieldgen, etc)
Some tweaks to light tube building code.
2015-10-08 19:50:01 +02:00