Commit Graph

11221 Commits

Author SHA1 Message Date
Remie Richards
58e6c40e16 Merge pull request #12322 from phil235/ExperimentorThrowFix
Fixes experimentor throwing stuff around one item at a time instead o…
2015-10-13 23:10:13 +01:00
Remie Richards
86c0a1805f Merge pull request #12321 from phil235/RuntimeFixA
Fixes some runtimes
2015-10-13 23:09:48 +01:00
Remie Richards
61d23d8c11 Merge pull request #12354 from KorPhaeron/AP
Adds armour penetration checks to shields, adds armour penetration to simple animals
2015-10-13 23:08:52 +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
fac1403423 Merge pull request #12324 from KorPhaeron/firingpins
Syndicate simple mob hotfix
2015-10-13 23:06:32 +01:00
Remie Richards
f15e858799 Merge pull request #12307 from optimumtact/autholathe
Port pizzastation autolathe improvements
2015-10-13 23:06:12 +01:00
Remie Richards
844f8e84fb Merge pull request #12271 from CosmicScientist/LarvaMe
Adds me to larva
2015-10-13 23:05:26 +01:00
Remie Richards
ebff3936b7 Merge pull request #12221 from Xhuis/im_here
Restores the Nar-Sie sound to "I'm here"
2015-10-13 23:04:56 +01:00
Remie Richards
55287c3eb9 Merge pull request #12314 from AnturK/morphfix
Fixes morph examine infinite loop
2015-10-13 23:04:15 +01:00
Remie Richards
9a7091cc5f Merge pull request #12346 from MrPerson/lighting_runtime_maybe
Disallow nulls in the lighting system's lights list
2015-10-13 23:03:46 +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
KorPhaeron
f1e12a2783 Buffs AP 2015-10-12 12:38:15 -05:00
CosmicScientist
582a3b0e1c Reverts line 105
Would cause more emotes than intended.
2015-10-12 13:30:27 +01:00
Razharas
84a5511836 Merge pull request #12283 from KorPhaeron/inworld
Removes a bunch of in world
2015-10-12 12:12:35 +03:00
MrPerson
d97d2a3bac Disallow nulls in the lighting system's lights list
This bug isn't reproducable so no, I'm not sure this will fix it. It's still a good idea to do this though.

Best guess as to what happened: A light was deleted pre-round for some reason. The garbage ss del()'d the light before the lighting system's first tick, so a null got into the lighting ss's lights list. This broke the whole system directly from roundstart and caused the thousands of "can't run null.check()" runtime errors from yesterday.
2015-10-12 01:52:30 -07:00
Cheridan
afafa9d7ed Merge pull request #12256 from Delimusca/confu2
fixed ethanol confusion
2015-10-11 23:49:28 -05:00
oranges
f3a3139b7a Disallow a hacked autholathe to build highcap cells
It was decided that this was probably a little to OP with stun prods
2015-10-12 08:28:27 +13:00
octareenroon91
c45b04c49d Port pizzastation autolathe improvements
Squashed version of 3 commits from pizza station

Match the build_type to its defined bitflags.

Introduce the "Machinery" category to accept low-tier machine parts.
The designs in question already identify themselves as AUTOLATHE - buildable.  They simply have no category.

Update stock_parts_designs.dm

Improve Autolathe selection

Now you can make basic power cells in your Autolathe!
2015-10-12 08:25:46 +13:00
KorPhaeron
4b162975cb Fix 2015-10-11 13:48:55 -05: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
8c291e4d60 Fixes experimentor throwing stuff around one item at a time instead of all at once. Also, it no longer throws anchored things. 2015-10-11 18:06:04 +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
KorPhaeron
20e79ee109 Tweaks 2015-10-11 08:56:13 -05:00
Jordie0608
d19954dd6f stealthmin check for kick notification 2015-10-11 23:16:24 +11: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
AnturK
6553207735 Fixes morph infinite loop 2015-10-11 13:10:11 +02:00
Remie Richards
89b12e561f Merge pull request #12171 from Iamgoofball/patch-130
Kicks now inform you who kicked you.
2015-10-11 01:24:41 +01:00
phil235
6bb09c92cd derp, removing comments, adding a missing Feedstop() 2015-10-10 21:53:22 +02: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
c95d0e740d Merge pull request #12144 from Shadowlight213/MalfBrain
Makes the Ai braindead message not appear if the AI shunts
2015-10-10 12:21:17 +02:00
phil235
63a19613e6 Merge pull request #12189 from Xhuis/#freedrone
Fixes drones being unable to be revived by other drones
2015-10-10 12:05:02 +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
5ba9cfd1cc Wrong PR 2015-10-09 23:12:41 -05:00
KorPhaeron
31836a5deb Removes in world 2015-10-09 22:37:53 -05:00
Razharas
422ac66f5f Merge pull request #12254 from francinum/patch-5
Spelling fixes to surgery
2015-10-10 05:12:13 +03: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
4c204a2335 Merge pull request #12222 from KorPhaeron/robusttendency
Medical HUD for support parasite/guardian
2015-10-10 03:33:50 +03: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
c884aa8243 Merge pull request #12233 from Jordie0608/iswearthewaythisevaluateskeepschanging
Misc fixes
2015-10-10 03:28:21 +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
ed7802599c Merge pull request #12208 from xxalpha/smoothballs
Fixed asteroid rock edging breaking wall smoothing.
2015-10-10 03:23:10 +03:00
Razharas
34f1552eb5 Merge pull request #12199 from Aranclanos/hypomedborg
Fixes medborgs injecting mobs without reagents with their hypospray
2015-10-10 03:17:11 +03:00
Razharas
acbe87be22 Merge pull request #12186 from MrStonedOne/patch-46
Adds logging and admin announce to admin ghosting.
2015-10-10 03:16:05 +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